refactor(docker-compose): use include and simplify usage

README.md

@@ -51,7 +51,7 @@ $ cd deployment
 ## Docker compose deployment
 
 > **Important**
-> [Docker Compose v2](https://docs.docker.com/compose/install/standalone/) is mandatory.  
+> [Docker Compose v2.20.3+](https://docs.docker.com/compose/install/standalone/) is mandatory.  
 > _See instructions in [sub-section](#installing--updating-docker-compose-to-v2)_
 
 
@@ -81,8 +81,7 @@ These folders (other than `explicit-profiles`) act now like an alias to `docker
 with the difference that they have implicitly a profile active and will be considered like another project stack,
 so compose commands will not affect others folders state.
 
-### Docker-compose profiles
-This is the preferred development deployment.  
+### Docker-compose with profiles
 _Everything described in this section is inside the folder `explicit-profiles`._
 
 Here's the summary of the profiles and what services they includes:

docker-compose/docker-compose.base.yml

@@ -1,4 +1,5 @@
 version: '4.0'
+
 services:
   case-server:
     profiles:
@@ -14,8 +15,8 @@ services:
     ports:
       - 5000:80
     volumes:
-      - $PWD/../../k8s/resources/common/config/case-server-application.yml:/config/specific/application.yml:Z
-      - $PWD/../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
+      - ../k8s/resources/common/config/case-server-application.yml:/config/specific/application.yml:Z
+      - ../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
     depends_on:
       logspout:
         condition: "service_started"
@@ -49,8 +50,8 @@ services:
     ports:
       - 5022:80
     volumes:
-      - $PWD/../../k8s/resources/common/config/actions-server-application.yml:/config/specific/application.yml:Z
-      - $PWD/../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
+      - ../k8s/resources/common/config/actions-server-application.yml:/config/specific/application.yml:Z
+      - ../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
     restart: unless-stopped
     depends_on:
       logspout:
@@ -81,8 +82,8 @@ services:
     ports:
       - 5027:80
     volumes:
-      - $PWD/../../k8s/resources/common/config/filter-server-application.yml:/config/specific/application.yml:Z
-      - $PWD/../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
+      - ../k8s/resources/common/config/filter-server-application.yml:/config/specific/application.yml:Z
+      - ../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
     restart: unless-stopped
     depends_on:
       logspout:
@@ -112,8 +113,8 @@ services:
     ports:
       - 5033:80
     volumes:
-      - $PWD/../../k8s/resources/common/config/user-admin-server-application.yml:/config/specific/application.yml:Z
-      - $PWD/../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
+      - ../k8s/resources/common/config/user-admin-server-application.yml:/config/specific/application.yml:Z
+      - ../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
     restart: unless-stopped
     depends_on:
       logspout:
@@ -143,8 +144,8 @@ services:
     ports:
       - 5035:80
     volumes:
-      - $PWD/../../k8s/resources/common/config/study-config-server-application.yml:/config/specific/application.yml:Z
-      - $PWD/../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
+      - ../k8s/resources/common/config/study-config-server-application.yml:/config/specific/application.yml:Z
+      - ../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
     restart: unless-stopped
     depends_on:
       logspout:
@@ -174,8 +175,8 @@ services:
     ports:
       - 5034:80
     volumes:
-      - $PWD/../../k8s/resources/common/config/user-identity-oidc-replication-server-application.yml:/config/specific/application.yml:Z
-      - $PWD/../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
+      - ../k8s/resources/common/config/user-identity-oidc-replication-server-application.yml:/config/specific/application.yml:Z
+      - ../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
     restart: unless-stopped
     depends_on:
       logspout:
@@ -206,8 +207,8 @@ services:
     ports:
       - 5028:80
     volumes:
-      - $PWD/../../k8s/resources/common/config/report-server-application.yml:/config/specific/application.yml:Z
-      - $PWD/../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
+      - ../k8s/resources/common/config/report-server-application.yml:/config/specific/application.yml:Z
+      - ../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
     restart: unless-stopped
     depends_on:
       logspout:
@@ -237,8 +238,8 @@ services:
     ports:
       - 8080:80
     volumes:
-      - $PWD/../../k8s/resources/common/config/network-store-server-application.yml:/config/specific/application.yml:Z
-      - $PWD/../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
+      - ../k8s/resources/common/config/network-store-server-application.yml:/config/specific/application.yml:Z
+      - ../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
     restart: unless-stopped
     depends_on:
       logspout:
@@ -268,9 +269,9 @@ services:
     ports:
       - 5003:80
     volumes:
-      - $PWD/../../k8s/resources/common/config/network-conversion-server-application.yml:/config/specific/application.yml:Z
-      - $PWD/../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
-      - $PWD/../../k8s/resources/common/config/network-conversion-server-config.yml:/home/powsybl/.itools/config.yml:Z
+      - ../k8s/resources/common/config/network-conversion-server-application.yml:/config/specific/application.yml:Z
+      - ../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
+      - ../k8s/resources/common/config/network-conversion-server-config.yml:/home/powsybl/.itools/config.yml:Z
     restart: unless-stopped
     depends_on:
       logspout:
@@ -300,9 +301,9 @@ services:
     ports:
       - 5008:80
     volumes:
-      - $PWD/../../k8s/resources/common/config/loadflow-server-application.yml:/config/specific/application.yml:Z
-      - $PWD/../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
-      - $PWD/../../k8s/resources/common/config/loadflow-server-config.yml:/home/powsybl/.itools/config.yml:Z
+      - ../k8s/resources/common/config/loadflow-server-application.yml:/config/specific/application.yml:Z
+      - ../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
+      - ../k8s/resources/common/config/loadflow-server-config.yml:/home/powsybl/.itools/config.yml:Z
     restart: unless-stopped
     depends_on:
       logspout:
@@ -332,8 +333,8 @@ services:
     ports:
       - 5025:80
     volumes:
-      - $PWD/../../k8s/resources/common/config/config-server-application.yml:/config/specific/application.yml:Z
-      - $PWD/../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
+      - ../k8s/resources/common/config/config-server-application.yml:/config/specific/application.yml:Z
+      - ../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
     restart: unless-stopped
     environment:
       - JAVA_TOOL_OPTIONS=-Xmx96m
@@ -359,8 +360,8 @@ services:
     ports:
       - 5024:80
     volumes:
-      - $PWD/../../k8s/resources/common/config/config-notification-server-application.yml:/config/specific/application.yml:Z
-      - $PWD/../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
+      - ../k8s/resources/common/config/config-notification-server-application.yml:/config/specific/application.yml:Z
+      - ../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
     restart: unless-stopped
     environment:
       - JAVA_TOOL_OPTIONS=-Xmx96m
@@ -386,9 +387,9 @@ services:
     ports:
       - 9000:80
     volumes:
-      - $PWD/../../k8s/resources/common/config/gateway-application.yml:/config/specific/application.yml:Z
-      - $PWD/../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
-      - $PWD/../allowed-issuers.yml:/config/allowed-issuers.yml:Z
+      - ../k8s/resources/common/config/gateway-application.yml:/config/specific/application.yml:Z
+      - ../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
+      - ./allowed-issuers.yml:/config/allowed-issuers.yml:Z
     restart: unless-stopped
     depends_on:
       logspout:
@@ -483,10 +484,10 @@ services:
     ports:
       - 8070:8080
     volumes:
-      - $PWD/../apps-metadata.json:/opt/bitnami/apache/htdocs/apps-metadata.json:Z
-      - $PWD/../../k8s/resources/common/config/apps-metadata-base-voltages.json:/opt/bitnami/apache/htdocs/apps-metadata-base-voltages.json:Z
-      - $PWD/../version.json:/opt/bitnami/apache/htdocs/version.json:Z
-      - $PWD/../gridapps-metadata-httpd.conf:/opt/bitnami/apache/conf/bitnami/bitnami.conf:Z
+      - ./apps-metadata.json:/opt/bitnami/apache/htdocs/apps-metadata.json:Z
+      - ../k8s/resources/common/config/apps-metadata-base-voltages.json:/opt/bitnami/apache/htdocs/apps-metadata-base-voltages.json:Z
+      - ./version.json:/opt/bitnami/apache/htdocs/version.json:Z
+      - ./gridapps-metadata-httpd.conf:/opt/bitnami/apache/conf/bitnami/bitnami.conf:Z
     depends_on:
       logspout:
         condition: "service_started"

docker-compose/dynamic-mapping/.env

@@ -1,4 +1,2 @@
-COMPOSE_PATH_SEPARATOR=:
 COMPOSE_PROJECT_NAME=griddynamicmapping
-COMPOSE_FILE=docker-compose.override.yml:../docker-compose.base.yml:../study/docker-compose.override.yml:../technical/docker-compose.technical.yml
 COMPOSE_PROFILES=dynamic-mapping

docker-compose/dynamic-mapping/docker-compose.override.yml → docker-compose/dynamic-mapping/docker-compose.dynamic-mapping.yml

@@ -11,8 +11,8 @@ services:
     ports:
       - 83:8080
     volumes:
-      - $PWD/../dynamic-mapping/griddyna-app-idpSettings.json:/opt/bitnami/apache/htdocs/griddyna/idpSettings.json:Z
-      - $PWD/../env.json:/opt/bitnami/apache/htdocs/griddyna/env.json:Z
+      - ./griddyna-app-idpSettings.json:/opt/bitnami/apache/htdocs/griddyna/idpSettings.json:Z
+      - ../env.json:/opt/bitnami/apache/htdocs/griddyna/env.json:Z
     depends_on:
       logspout:
         condition: "service_started"
@@ -34,8 +34,8 @@ services:
     ports:
       - 5036:80
     volumes:
-      - $PWD/../../k8s/resources/dynamic-mapping/config/dynamic-mapping-server-application.yml:/config/specific/application.yml:Z
-      - $PWD/../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
+      - ../../k8s/resources/dynamic-mapping/config/dynamic-mapping-server-application.yml:/config/specific/application.yml:Z
+      - ../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
     restart: unless-stopped
     depends_on:
       logspout:

docker-compose/dynamic-mapping/docker-compose.yml

@@ -0,0 +1,5 @@
+include:
+  - ../docker-compose.base.yml
+  - ../technical/docker-compose.technical.yml
+  - ../study/docker-compose.study.yml
+  - docker-compose.dynamic-mapping.yml

docker-compose/explicit-profiles/.env

@@ -1,3 +1 @@
-COMPOSE_PATH_SEPARATOR=:
 COMPOSE_PROJECT_NAME=grid
-COMPOSE_FILE=../docker-compose.base.yml:../study/docker-compose.override.yml:../dynamic-mapping/docker-compose.override.yml:../technical/docker-compose.technical.yml:../monitor/docker-compose.override.yml

docker-compose/explicit-profiles/docker-compose.yml

@@ -0,0 +1,6 @@
+include:
+  - ../technical/docker-compose.technical.yml
+  - ../dynamic-mapping/docker-compose.dynamic-mapping.yml
+  - ../monitor/docker-compose.monitor.yml
+  - ../study/docker-compose.study.yml
+  - ../docker-compose.base.yml

docker-compose/monitor/.env

@@ -1,4 +1,2 @@
-COMPOSE_PATH_SEPARATOR=:
 COMPOSE_PROJECT_NAME=gridmonitor
-COMPOSE_FILE=docker-compose.override.yml:../docker-compose.base.yml:../dynamic-mapping/docker-compose.override.yml:../study/docker-compose.override.yml:../technical/docker-compose.technical.yml
 COMPOSE_PROFILES=monitor

docker-compose/monitor/docker-compose.override.yml → docker-compose/monitor/docker-compose.monitor.yml

@@ -9,8 +9,8 @@ services:
     ports:
       - 5043:80
     volumes:
-      - $PWD/../../k8s/resources/monitor/config/monitor-server-application.yml:/config/specific/application.yml:Z
-      - $PWD/../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
+      - ../../k8s/resources/monitor/config/monitor-server-application.yml:/config/specific/application.yml:Z
+      - ../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
     restart: unless-stopped
     environment:
       - JAVA_TOOL_OPTIONS=-Xmx96m
@@ -29,9 +29,9 @@ services:
       - monitor
     image: gridsuite/monitor-worker-server:latest
     volumes:
-      - $PWD/../../k8s/resources/monitor/config/monitor-sa-worker-server-application.yml:/config/specific/application.yml:Z
-      - ${PATH_TO_STUDY_COMPOSE:-$PWD}/../../k8s/resources/monitor/config/monitor-sa-worker-server-config.yml:/home/powsybl/.itools/config.yml:Z
-      - $PWD/../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
+      - ../../k8s/resources/monitor/config/monitor-sa-worker-server-application.yml:/config/specific/application.yml:Z
+      - ../../k8s/resources/monitor/config/monitor-sa-worker-server-config.yml:/home/powsybl/.itools/config.yml:Z
+      - ../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
     restart: unless-stopped
     environment:
       - JAVA_TOOL_OPTIONS=-Xmx1086m #deployment: 3072m

docker-compose/monitor/docker-compose.yml

@@ -0,0 +1,6 @@
+include:
+  - ../docker-compose.base.yml
+  - ../technical/docker-compose.technical.yml
+  - ../dynamic-mapping/docker-compose.dynamic-mapping.yml
+  - ../study/docker-compose.study.yml
+  - docker-compose.monitor.yml

docker-compose/study/.env

@@ -1,7 +1,5 @@
 SHOULD_INIT_GEO_DATA=true
 SHOULD_INIT_LINES_CATALOG=true
 
-COMPOSE_PATH_SEPARATOR=:
 COMPOSE_PROJECT_NAME=gridstudy
-COMPOSE_FILE=docker-compose.override.yml:../docker-compose.base.yml:../dynamic-mapping/docker-compose.override.yml:../technical/docker-compose.technical.yml
 COMPOSE_PROFILES=study