diff --git a/deployment/.env b/deployment/.env index 73fa38cce..1fca68a0c 100644 --- a/deployment/.env +++ b/deployment/.env @@ -11,7 +11,7 @@ POSTGRES_TAG=16-alpine ELK_TAG=8.13.0 KEYCLOAK_TAG=24.0.2 RABBITMQ_TAG=3.13-management -GOTENBERG_TAG=8.4.0 +PDF_SERVICE_TAG=8.4.0 #Application configuration DOCKER_REGISTRY=crepo.cite.gr/ @@ -20,4 +20,9 @@ PROFILE=test #port speficiations SERVER_PORT=8080 PROXY_APP_PORT=8081 -POSTGRES_PORT=5432 \ No newline at end of file +POSTGRES_PORT=5432 + +#storage paths +CONFIG_FILES_PATH=./config-files/ +LOG_FILES_PATH=./logs/ +STORAGE_PATH=./storage/ \ No newline at end of file diff --git a/deployment/docker-compose.override.yml b/deployment/docker-compose.override.yml index 8fba06b84..de22d7485 100644 --- a/deployment/docker-compose.override.yml +++ b/deployment/docker-compose.override.yml @@ -7,13 +7,13 @@ services: ports: - "${PROXY_APP_PORT}:8081" volumes: - - ./proxy/nginx.conf:/etc/nginx/nginx.conf - - ./proxy/ProxyNginx.conf:/etc/nginx/conf.d/default.conf - - ./logs/proxy:/tmp/logs + - ${CONFIG_FILES_PATH}proxy/nginx.conf:/etc/nginx/nginx.conf + - ${CONFIG_FILES_PATH}proxy/ProxyNginx.conf:/etc/nginx/conf.d/default.conf + - ${LOG_FILES_PATH}proxy:/tmp/logs networks: - opencdmp-proxy-network -############################## OPENDMP APP ################################# +############################## OPENCDMP APP ################################# opencdmp.backend: restart: unless-stopped cpus: 1 @@ -23,13 +23,13 @@ services: ports: - "0.0.0.0:50030:8080" volumes: - - ./opencdmp/backend/config:/config - - ./opencdmp/backend/certificates:/certificates - - ./opencdmp/backend/i18n:/i18n - - ./opencdmp/backend/material:/material - - ./opencdmp/backend/Semantics.json:/Semantics.json - - ./storage/opencdmp/backend:/storage - - ./logs/opencdmp/backend:/logs + - ${CONFIG_FILES_PATH}opencdmp/backend/config:/config + - ${CONFIG_FILES_PATH}opencdmp/backend/certificates:/certificates + - ${CONFIG_FILES_PATH}opencdmp/backend/i18n:/i18n + - ${CONFIG_FILES_PATH}opencdmp/backend/material:/material + - ${CONFIG_FILES_PATH}opencdmp/backend/Semantics.json:/Semantics.json + - ${STORAGE_PATH}opencdmp/backend:/storage + - ${LOG_FILES_PATH}opencdmp/backend:/logs networks: - opencdmp-proxy-network - opencdmp-backend-network @@ -46,9 +46,9 @@ services: ports: - "0.0.0.0:50031:8080" volumes: - - ./opencdmp/frontend/config.json:/usr/share/nginx/html/assets/config/config.json - - ./opencdmp/frontend/nginx.conf:/etc/nginx/nginx.conf - - ./opencdmp/frontend/WebAppNginx.conf:/etc/nginx/conf.d/default.conf + - ${CONFIG_FILES_PATH}opencdmp/frontend/config.json:/usr/share/nginx/html/assets/config/config.json + - ${CONFIG_FILES_PATH}opencdmp/frontend/nginx.conf:/etc/nginx/nginx.conf + - ${CONFIG_FILES_PATH}opencdmp/frontend/WebAppNginx.conf:/etc/nginx/conf.d/default.conf networks: - opencdmp-proxy-network @@ -61,10 +61,10 @@ services: environment: - PROFILE=${PROFILE} volumes: - - ./opencdmp/notification/config:/config - - ./opencdmp/notification/messages:/messages - - ./opencdmp/notification/notification_templates:/notification_templates - - ./logs/opencdmp/notification:/logs + - ${CONFIG_FILES_PATH}opencdmp/notification/config:/config + - ${CONFIG_FILES_PATH}opencdmp/notification/messages:/messages + - ${CONFIG_FILES_PATH}opencdmp/notification/notification_templates:/notification_templates + - ${LOG_FILES_PATH}opencdmp/notification:/logs networks: - opencdmp-proxy-network - opencdmp-backend-network @@ -81,9 +81,9 @@ services: environment: - PROFILE=${PROFILE} volumes: - - ./opencdmp/annotation/config:/config - - ./opencdmp/annotation/messages:/messages - - ./logs/opencdmp/annotation:/logs + - ${CONFIG_FILES_PATH}opencdmp/annotation/config:/config + - ${CONFIG_FILES_PATH}opencdmp/annotation/messages:/messages + - ${LOG_FILES_PATH}opencdmp/annotation:/logs networks: - opencdmp-proxy-network - opencdmp-backend-network @@ -103,9 +103,9 @@ services: - SERVER_PORT=${SERVER_PORT} - PROFILE=${PROFILE} volumes: - - ./opencdmp/file-transformer-docx/config:/config - - ./logs/opencdmp/file-transformer-docx:/logs - # - ./storage/opencdmp/file-transformer-docx:/storage + - ${CONFIG_FILES_PATH}opencdmp/file-transformer-docx/config:/config + - ${LOG_FILES_PATH}opencdmp/file-transformer-docx:/logs + # - ${STORAGE_PATH}opencdmp/file-transformer-docx:/storage networks: - opencdmp-plugins-network - opencdmp-gotenberg-shared-network @@ -120,10 +120,10 @@ services: - SERVER_PORT=${SERVER_PORT} - PROFILE=${PROFILE} volumes: - - ./opencdmp/file-transformer-rda-json/config:/config - - ./opencdmp/file-transformer-rda-json/internal:/internal - - ./logs/opencdmp/file-transformer-rda-json:/logs - # - ./storage/opencdmp/file-transformer-rda-json:/storage + - ${CONFIG_FILES_PATH}opencdmp/file-transformer-rda-json/config:/config + - ${CONFIG_FILES_PATH}opencdmp/file-transformer-rda-json/internal:/internal + - ${LOG_FILES_PATH}opencdmp/file-transformer-rda-json:/logs + # - ${STORAGE_PATH}opencdmp/file-transformer-rda-json:/storage networks: - opencdmp-plugins-network @@ -137,10 +137,10 @@ services: environment: - PROFILE=${PROFILE} volumes: - - ./opencdmp/zenodo/config:/config - - ./opencdmp/zenodo/zenodo.jpg:/zenodo.jpg - - ./logs/opencdmp/zenodo:/logs - # - ./storage/opencdmp/zenodo:/storage + - ${CONFIG_FILES_PATH}opencdmp/zenodo/config:/config + - ${CONFIG_FILES_PATH}opencdmp/zenodo/zenodo.jpg:/zenodo.jpg + - ${LOG_FILES_PATH}opencdmp/zenodo:/logs + # - ${STORAGE_PATH}opencdmp/zenodo:/storage networks: - opencdmp-plugins-network - opencdmp-keycloak-shared-network @@ -154,10 +154,10 @@ services: # - "127.0.0.1:${POSTGRES_PORT}:5432" # If you want to make it accessible locally only - "${POSTGRES_PORT}:5432" env_file: - - ./postgres/postgres.env + - ${CONFIG_FILES_PATH}postgres/postgres.env volumes: - - ./storage/postgres/data:/var/lib/postgresql/data - - ./postgres/opencdmp_init.sql:/docker-entrypoint-initdb.d/opencdmp_init.sql + - ${STORAGE_PATH}postgres/data:/var/lib/postgresql/data + - ${CONFIG_FILES_PATH}postgres/opencdmp_init.sql:/docker-entrypoint-initdb.d/opencdmp_init.sql networks: - opencdmp-postgres-shared-network healthcheck: @@ -173,7 +173,7 @@ services: cpus: 2 mem_limit: 1024m env_file: - - ./elk/elk.env + - ${CONFIG_FILES_PATH}elk/elk.env environment: ES_JAVA_OPTS: -Xmx512m -Xms512m ulimits: @@ -182,11 +182,11 @@ services: soft: -1 hard: -1 volumes: - - ./elk/elasticsearch/index_init.sh:/usr/share/elasticsearch/config/index_init.sh - - ./elk/elasticsearch/log4j2.properties:/usr/share/elasticsearch/config/log4j2.properties:ro - - ./elk/elasticsearch/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml:ro - - ./storage/elasticsearch:/usr/share/elasticsearch/data - - ./logs/elasticsearch:/usr/share/elasticsearch/logs + - ${CONFIG_FILES_PATH}elk/elasticsearch/index_init.sh:/usr/share/elasticsearch/config/index_init.sh + - ${CONFIG_FILES_PATH}elk/elasticsearch/log4j2.properties:/usr/share/elasticsearch/config/log4j2.properties:ro + - ${CONFIG_FILES_PATH}elk/elasticsearch/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml:ro + - ${STORAGE_PATH}elasticsearch:/usr/share/elasticsearch/data + - ${LOG_FILES_PATH}elasticsearch:/usr/share/elasticsearch/logs expose: - "9200" - "9300" @@ -205,13 +205,13 @@ services: cpus: 2 mem_limit: 2048M env_file: - - ./keycloak/keycloak.env + - ${CONFIG_FILES_PATH}keycloak/keycloak.env environment: - JAVA_OPTS_APPEND="-Djava.net.preferIPv4Stack=true" volumes: - - ./logs/keycloak:/tmp/logs - - ./keycloak/user_init.sh:/tmp/user_init.sh - - ./keycloak/imports/opencdmp-realm.json:/opt/keycloak/data/import/opencdmp-realm.json + - ${LOG_FILES_PATH}keycloak:/tmp/logs + - ${CONFIG_FILES_PATH}keycloak/user_init.sh:/tmp/user_init.sh + - ${CONFIG_FILES_PATH}keycloak/imports/opencdmp-realm.json:/opt/keycloak/data/import/opencdmp-realm.json expose: - "8080" networks: @@ -230,14 +230,14 @@ services: - "0.0.0.0:15672:15672" - "0.0.0.0:5672:5672" env_file: - - ./rabbitmq/rabbitmq.env + - ${CONFIG_FILES_PATH}rabbitmq/rabbitmq.env volumes: - - /rabbitmq/rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf:ro + - ${CONFIG_FILES_PATH}rabbitmq/rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf:ro networks: - opencdmp-rabbitmq-shared-network ################################# GOTENBERG ############################################## - opencdmp.gotenberg: + opencdmp.pdf-service: cpus: 2 mem_limit: 2048m restart: unless-stopped @@ -245,7 +245,7 @@ services: - "3000" hostname: gotenberg env_file: - - ./gotenberg/gotenberg.env + - ${CONFIG_FILES_PATH}gotenberg/gotenberg.env networks: - opencdmp-gotenberg-shared-network diff --git a/deployment/docker-compose.yml b/deployment/docker-compose.yml index b8565d7b1..9ba84693b 100644 --- a/deployment/docker-compose.yml +++ b/deployment/docker-compose.yml @@ -14,7 +14,7 @@ services: opencdmp.annotation: condition: service_started -############################## OPENDMP APP ################################# +############################## OPENCDMP APP ################################# opencdmp.frontend: container_name: opencdmp.frontend @@ -98,6 +98,6 @@ services: image: rabbitmq:${RABBITMQ_TAG} ############################## GOTENBERG ############################################## - opencdmp.gotenberg: - image: gotenberg/gotenberg:${GOTENBERG_TAG} - container_name: opencdmp.gotenberg + opencdmp.pdf-service: + image: gotenberg/gotenberg:${PDF_SERVICE_TAG} + container_name: opencdmp.pdf-service diff --git a/deployment/opencdmp/file-transformer-docx/config/app.env b/deployment/opencdmp/file-transformer-docx/config/app.env index b5d5b9610..648109013 100644 --- a/deployment/opencdmp/file-transformer-docx/config/app.env +++ b/deployment/opencdmp/file-transformer-docx/config/app.env @@ -2,7 +2,7 @@ IDP_ISSUER_URI=http://host.docker.internal:8081/keycloak/realms/OpenCDMP #PDF -PDF_CONVERTER_URL=http://opencdmp.gotenberg:3000 +PDF_CONVERTER_URL=http://opencdmp.pdf-service:3000 #Storage STORAGE_PATH=/storage \ No newline at end of file