Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring

# Conflicts:
#	deployment/.env
#	deployment/docker-compose.yml

deployment/.env

@@ -1,33 +1,29 @@
-#Nginx#
+#OpenCDMP
 PROXY_TAG=mainline-alpine
-
-#OpenCDMP#
 MAIN_APP_TAG=2.5.8
 NOTIFICATION_APP_TAG=0.0.7
 ANNOTATION_APP_TAG=0.0.7
-
-#File-Transformers#
 DOCX_APP_TAG=0.0.23
 JSON_APP_TAG=0.0.18
-
-#Zenodo#
 ZENODO_APP_TAG=2.1.7
 
-#Microservices#
+#Other Services
 POSTGRES_TAG=16-alpine
 ELK_TAG=8.13.0
 KEYCLOAK_TAG=24.0.2
 RABBITMQ_TAG=3.15-management
-GOTENBERG_TAG=8.9.2
+PDF_SERVICE_TAG=8.9.2
 
-#Application configuration
+#Docker configuration
 DOCKER_REGISTRY=crepo.cite.gr/
 PROFILE=test
 
-#port speficiations
+#Port settings
 SERVER_PORT=8080
 PROXY_APP_PORT=8081
 POSTGRES_PORT=5432
 
-#DOCS#
+#Storage paths
-DOCS_TAG=2.4.8
+CONFIG_FILES_PATH=./config-files/
+LOG_FILES_PATH=./logs/
+STORAGE_PATH=./storage/

deployment/docker-compose.override.yml

@@ -7,13 +7,13 @@ services:
     ports:
       - "${PROXY_APP_PORT}:8081"
     volumes:
-      - ./proxy/nginx.conf:/etc/nginx/nginx.conf
+      - ${CONFIG_FILES_PATH}proxy/nginx.conf:/etc/nginx/nginx.conf
-      - ./proxy/ProxyNginx.conf:/etc/nginx/conf.d/default.conf
+      - ${CONFIG_FILES_PATH}proxy/ProxyNginx.conf:/etc/nginx/conf.d/default.conf
-      - ./logs/proxy:/tmp/logs
+      - ${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
+      - ${CONFIG_FILES_PATH}opencdmp/backend/config:/config
-      - ./opencdmp/backend/certificates:/certificates
+      - ${CONFIG_FILES_PATH}opencdmp/backend/certificates:/certificates
-      - ./opencdmp/backend/i18n:/i18n
+      - ${CONFIG_FILES_PATH}opencdmp/backend/i18n:/i18n
-      - ./opencdmp/backend/material:/material
+      - ${CONFIG_FILES_PATH}opencdmp/backend/material:/material
-      - ./opencdmp/backend/Semantics.json:/Semantics.json
+      - ${CONFIG_FILES_PATH}opencdmp/backend/Semantics.json:/Semantics.json
-      - ./storage/opencdmp/backend:/storage
+      - ${STORAGE_PATH}opencdmp/backend:/storage
-      - ./logs/opencdmp/backend:/logs
+      - ${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
+      - ${CONFIG_FILES_PATH}opencdmp/frontend/config.json:/usr/share/nginx/html/assets/config/config.json
-      - ./opencdmp/frontend/nginx.conf:/etc/nginx/nginx.conf
+      - ${CONFIG_FILES_PATH}opencdmp/frontend/nginx.conf:/etc/nginx/nginx.conf
-      - ./opencdmp/frontend/WebAppNginx.conf:/etc/nginx/conf.d/default.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
+      - ${CONFIG_FILES_PATH}opencdmp/notification/config:/config
-      - ./opencdmp/notification/messages:/messages
+      - ${CONFIG_FILES_PATH}opencdmp/notification/messages:/messages
-      - ./opencdmp/notification/notification_templates:/notification_templates
+      - ${CONFIG_FILES_PATH}opencdmp/notification/notification_templates:/notification_templates
-      - ./logs/opencdmp/notification:/logs
+      - ${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
+      - ${CONFIG_FILES_PATH}opencdmp/annotation/config:/config
-      - ./opencdmp/annotation/messages:/messages
+      - ${CONFIG_FILES_PATH}opencdmp/annotation/messages:/messages
-      - ./logs/opencdmp/annotation:/logs
+      - ${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
+      - ${CONFIG_FILES_PATH}opencdmp/file-transformer-docx/config:/config
-      - ./logs/opencdmp/file-transformer-docx:/logs
+      - ${LOG_FILES_PATH}opencdmp/file-transformer-docx:/logs
-      # - ./storage/opencdmp/file-transformer-docx:/storage
+      # - ${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
+      - ${CONFIG_FILES_PATH}opencdmp/file-transformer-rda-json/config:/config
-      - ./opencdmp/file-transformer-rda-json/internal:/internal
+      - ${CONFIG_FILES_PATH}opencdmp/file-transformer-rda-json/internal:/internal
-      - ./logs/opencdmp/file-transformer-rda-json:/logs
+      - ${LOG_FILES_PATH}opencdmp/file-transformer-rda-json:/logs
-      # - ./storage/opencdmp/file-transformer-rda-json:/storage
+      # - ${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
+      - ${CONFIG_FILES_PATH}opencdmp/zenodo/config:/config
-      - ./opencdmp/zenodo/zenodo.jpg:/zenodo.jpg
+      - ${CONFIG_FILES_PATH}opencdmp/zenodo/zenodo.jpg:/zenodo.jpg
-      - ./logs/opencdmp/zenodo:/logs
+      - ${LOG_FILES_PATH}opencdmp/zenodo:/logs
-      # - ./storage/opencdmp/zenodo:/storage
+      # - ${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
+        - ${STORAGE_PATH}postgres/data:/var/lib/postgresql/data
-        - ./postgres/opencdmp_init.sql:/docker-entrypoint-initdb.d/opencdmp_init.sql
+        - ${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
+      - ${CONFIG_FILES_PATH}elk/elasticsearch/index_init.sh:/usr/share/elasticsearch/config/index_init.sh
-      - ./elk/elasticsearch/log4j2.properties:/usr/share/elasticsearch/config/log4j2.properties:ro
+      - ${CONFIG_FILES_PATH}elk/elasticsearch/log4j2.properties:/usr/share/elasticsearch/config/log4j2.properties:ro
-      - ./elk/elasticsearch/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml:ro
+      - ${CONFIG_FILES_PATH}elk/elasticsearch/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml:ro
-      - ./storage/elasticsearch:/usr/share/elasticsearch/data
+      - ${STORAGE_PATH}elasticsearch:/usr/share/elasticsearch/data
-      - ./logs/elasticsearch:/usr/share/elasticsearch/logs
+      - ${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
+      - ${LOG_FILES_PATH}keycloak:/tmp/logs
-      - ./keycloak/user_init.sh:/tmp/user_init.sh
+      - ${CONFIG_FILES_PATH}keycloak/user_init.sh:/tmp/user_init.sh
-      - ./keycloak/imports/opencdmp-realm.json:/opt/keycloak/data/import/opencdmp-realm.json
+      - ${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
 

deployment/docker-compose.yml

@@ -1,5 +1,4 @@
 services:
-
 ############################## PROXY ########################################
   opencdmp.proxy:
       container_name: opencdmp.proxy
@@ -14,7 +13,7 @@ services:
         opencdmp.annotation:
           condition: service_started
 
-############################## OPENDMP APP #################################
+############################## OPENCDMP APP #################################
 
   opencdmp.frontend:
     container_name: opencdmp.frontend
@@ -74,7 +73,7 @@ services:
       opencdmp.backend:
         condition: service_started
 
-############################## POSTGRES 16 ############################################
+############################## POSTGRES ############################################
   opencdmp.postgres:
     container_name: opencdmp.postgres
     image: postgres:${POSTGRES_TAG}
@@ -97,13 +96,7 @@ services:
     container_name: opencdmp.rabbitmq
     image: rabbitmq:${RABBITMQ_TAG}
 
-############################## GOTENBERG ##############################################
+############################## PDF SERVICE ##############################################
-  opencdmp.gotenberg:
+  opencdmp.pdf-service:
-    image: gotenberg/gotenberg:${GOTENBERG_TAG}
+    image: gotenberg/gotenberg:${PDF_SERVICE_TAG}
-    container_name: opencdmp.gotenberg
+    container_name: opencdmp.pdf-service
-
-################################## DOCS #########################################
-
-  opendmp.docs:
-     container_name: opendmp.docs
-     image: ${DOCKER_REGISTRY}opencdmp-docs:${DOCS_TAG}

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