From d0d234da232028ca3e7b73a2489abd1a028b35a2 Mon Sep 17 00:00:00 2001 From: amandilaras Date: Fri, 20 Sep 2024 13:52:25 +0300 Subject: [PATCH] deployment updates --- deployment/.env | 10 +- .../opencdmp/backend/config/app.env | 5 +- deployment/config-files/proxy/ProxyNginx.conf | 16 ++-- .../config-files/rabbitmq/rabbitmq.conf | 2 +- deployment/deploy_opencdmp.sh | 1 + deployment/docker-compose.override.yml | 94 +++++++++---------- 6 files changed, 66 insertions(+), 62 deletions(-) diff --git a/deployment/.env b/deployment/.env index d9c7b6357..f226c203b 100644 --- a/deployment/.env +++ b/deployment/.env @@ -9,8 +9,8 @@ ZENODO_APP_TAG=2.1.7 #Other Services POSTGRES_TAG=16-alpine -ELK_TAG=8.13.0 -KEYCLOAK_TAG=24.0.2 +ELK_TAG=8.15.1 +KEYCLOAK_TAG=25.0.6 RABBITMQ_TAG=3.13-management PDF_SERVICE_TAG=8.9.2 @@ -24,6 +24,6 @@ PROXY_APP_PORT=8081 POSTGRES_PORT=5432 #Storage paths -CONFIG_FILES_PATH=./config-files/ -LOG_FILES_PATH=./logs/ -STORAGE_PATH=./storage/ +CONFIG_FILES_PATH=./config-files +LOG_FILES_PATH=./logs +STORAGE_PATH=./storage diff --git a/deployment/config-files/opencdmp/backend/config/app.env b/deployment/config-files/opencdmp/backend/config/app.env index ec8d5e82e..813612f05 100644 --- a/deployment/config-files/opencdmp/backend/config/app.env +++ b/deployment/config-files/opencdmp/backend/config/app.env @@ -42,4 +42,7 @@ IDP_APIKEY_SCOPE=dmp_plugins #METRICS IDP_APIKEY_CLIENT_ID_UUID=c82150e9-a9e5-4a5f-bd0f-5f25460b3e08 -QUEUE_APP_ID=opencdmp-api-dev \ No newline at end of file +QUEUE_APP_ID=opencdmp-api-dev + +ACCOUNTING_ENABLED=false +USAGE_LIMIT_ENABLED=false \ No newline at end of file diff --git a/deployment/config-files/proxy/ProxyNginx.conf b/deployment/config-files/proxy/ProxyNginx.conf index c7f80b91d..694102e8d 100644 --- a/deployment/config-files/proxy/ProxyNginx.conf +++ b/deployment/config-files/proxy/ProxyNginx.conf @@ -31,9 +31,9 @@ server { proxy_set_header X-Forwarded-Proto $scheme; # Fix the “It appears that your reverse proxy set up is broken" error. - proxy_pass http://opencdmp.frontend:8080; + proxy_pass http://opencdmp.frontend:8080/; proxy_read_timeout 90; - proxy_redirect http://opencdmp.frontend:8080 http://host.docker.internal:8081; + proxy_redirect http://opencdmp.frontend:8080/ http://host.docker.internal:8081/; } location /api/ { @@ -44,9 +44,9 @@ server { proxy_set_header X-Forwarded-Proto $scheme; # Fix the “It appears that your reverse proxy set up is broken" error. - proxy_pass http://opencdmp.backend:8080; + proxy_pass http://opencdmp.backend:8080/; proxy_read_timeout 90; - proxy_redirect http://opencdmp.backend:8080 http://host.docker.internal:8081/api; + proxy_redirect http://opencdmp.backend:8080/ http://host.docker.internal:8081/api/; } location /api/notification/ { @@ -57,9 +57,9 @@ server { proxy_set_header X-Forwarded-Proto $scheme; # Fix the “It appears that your reverse proxy set up is broken" error. - proxy_pass http://opencdmp.notification:8080; + proxy_pass http://opencdmp.notification:8080/; proxy_read_timeout 90; - proxy_redirect http://opencdmp.notification:8080 http://host.docker.internal:8081/api/notification; + proxy_redirect http://opencdmp.notification:8080/ http://host.docker.internal:8081/api/notification/; } location /api/annotation/ { @@ -70,9 +70,9 @@ server { proxy_set_header X-Forwarded-Proto $scheme; # Fix the “It appears that your reverse proxy set up is broken" error. - proxy_pass http://opencdmp.annotation:8080; + proxy_pass http://opencdmp.annotation:8080/; proxy_read_timeout 90; - proxy_redirect http://opencdmp.annotation:8080 http://host.docker.internal:8081/api/annotation; + proxy_redirect http://opencdmp.annotation:8080/ http://host.docker.internal:8081/api/annotation/; } location /keycloak/ { diff --git a/deployment/config-files/rabbitmq/rabbitmq.conf b/deployment/config-files/rabbitmq/rabbitmq.conf index 0f307857c..ed11faf49 100644 --- a/deployment/config-files/rabbitmq/rabbitmq.conf +++ b/deployment/config-files/rabbitmq/rabbitmq.conf @@ -1,2 +1,2 @@ -deprecated_features.permit.management_metrics_collection = false +deprecated_features.permit.management_metrics_collection = true proxy_protocol = true \ No newline at end of file diff --git a/deployment/deploy_opencdmp.sh b/deployment/deploy_opencdmp.sh index 57d5833c3..d71a0ed05 100644 --- a/deployment/deploy_opencdmp.sh +++ b/deployment/deploy_opencdmp.sh @@ -25,6 +25,7 @@ docker-compose down docker-compose pull chmod 744 ./config-files/elk/elasticsearch/index_init.sh +sed -i -e 's/\r$//' ./config-files/elk/elasticsearch/index_init.sh if [[ $1 == "-r" ]]; then echo "Resetting PostgreSQL and Elasticsearch storage..." diff --git a/deployment/docker-compose.override.yml b/deployment/docker-compose.override.yml index a7315e799..e4ea8d5e9 100644 --- a/deployment/docker-compose.override.yml +++ b/deployment/docker-compose.override.yml @@ -7,9 +7,9 @@ services: ports: - "${PROXY_APP_PORT}:8081" volumes: - - ${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 + - ${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 @@ -23,13 +23,13 @@ services: ports: - "0.0.0.0:50030:8080" volumes: - - ${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 + - ${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: - - ${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 + - ${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: - - ${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 + - ${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: - - ${CONFIG_FILES_PATH}opencdmp/annotation/config:/config - - ${CONFIG_FILES_PATH}opencdmp/annotation/messages:/messages - - ${LOG_FILES_PATH}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: - - ${CONFIG_FILES_PATH}opencdmp/file-transformer-docx/config:/config - - ${LOG_FILES_PATH}opencdmp/file-transformer-docx:/logs - # - ${STORAGE_PATH}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-pdf-service-shared-network @@ -120,9 +120,9 @@ services: - SERVER_PORT=${SERVER_PORT} - PROFILE=${PROFILE} volumes: - - ${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 + - ${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 networks: - opencdmp-plugins-network @@ -136,9 +136,9 @@ services: environment: - PROFILE=${PROFILE} volumes: - - ${CONFIG_FILES_PATH}opencdmp/zenodo/config:/config - - ${CONFIG_FILES_PATH}opencdmp/zenodo/zenodo.jpg:/zenodo.jpg - - ${LOG_FILES_PATH}opencdmp/zenodo:/logs + - ${CONFIG_FILES_PATH}/opencdmp/zenodo/config:/config + - ${CONFIG_FILES_PATH}/opencdmp/zenodo/zenodo.jpg:/zenodo.jpg + - ${LOG_FILES_PATH}/opencdmp/zenodo:/logs networks: - opencdmp-plugins-network - opencdmp-keycloak-shared-network @@ -151,10 +151,10 @@ services: ports: - "${POSTGRES_PORT}:5432" env_file: - - ${CONFIG_FILES_PATH}postgres/postgres.env + - ${CONFIG_FILES_PATH}/postgres/postgres.env volumes: - - ${STORAGE_PATH}postgres/data:/var/lib/postgresql/data - - ${CONFIG_FILES_PATH}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: @@ -168,22 +168,22 @@ services: opencdmp.elasticsearch: restart: unless-stopped cpus: 2 - mem_limit: 1024m + mem_limit: 2048m env_file: - - ${CONFIG_FILES_PATH}elk/elk.env + - ${CONFIG_FILES_PATH}/elk/elk.env environment: - ES_JAVA_OPTS: -Xmx512m -Xms512m + ES_JAVA_OPTS: -Xmx1024m -Xms1024m ulimits: nproc: 65535 memlock: soft: -1 hard: -1 volumes: - - ${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 + - ${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" @@ -202,13 +202,13 @@ services: cpus: 2 mem_limit: 2048M env_file: - - ${CONFIG_FILES_PATH}keycloak/keycloak.env + - ${CONFIG_FILES_PATH}/keycloak/keycloak.env environment: - JAVA_OPTS_APPEND="-Djava.net.preferIPv4Stack=true" volumes: - - ${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 + - ${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: @@ -227,9 +227,9 @@ services: - "0.0.0.0:15672:15672" - "0.0.0.0:5672:5672" env_file: - - ${CONFIG_FILES_PATH}rabbitmq/rabbitmq.env + - ${CONFIG_FILES_PATH}/rabbitmq/rabbitmq.env volumes: - - ${CONFIG_FILES_PATH}rabbitmq/rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf:ro + - ${CONFIG_FILES_PATH}/rabbitmq/rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf:ro networks: - opencdmp-rabbitmq-shared-network @@ -242,7 +242,7 @@ services: - "3000" hostname: pdf-service env_file: - - ${CONFIG_FILES_PATH}pdf-service/pdf-service.env + - ${CONFIG_FILES_PATH}/pdf-service/pdf-service.env networks: - opencdmp-pdf-service-shared-network