update 8.5

camunda · Jan 10, 2025 · 019a4de · 019a4de
1 parent 56ebcb1
commit 019a4de
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 18 deletions.
diff --git a/.github/workflows/docker-compose-test-e2e-full-setup.yaml b/.github/workflows/docker-compose-test-e2e-full-setup.yaml
@@ -39,70 +39,71 @@ jobs:
           # Camunda 8.3
           - name: ⭐ Camunda 8.3 ⭐
             camunda-version: "8.3"
-            compose-args: "-f docker-compose.yaml"
+            main-compose-args: "-f docker-compose.yaml"
             e2e-test-enabled: false
           - name: Camunda 8.3 - Core
             camunda-version: "8.3"
-            compose-args: "-f docker-compose-core.yaml"
+            main-compose-args: "-f docker-compose-core.yaml"
             e2e-test-enabled: false
           - name: Camunda 8.3 - Web Modeler
             camunda-version: "8.3"
-            compose-args: "-f docker-compose-web-modeler.yaml"
+            main-compose-args: "-f docker-compose-web-modeler.yaml"
             e2e-test-enabled: false
           # Camunda 8.4
           - name: Camunda 8.4 ⭐
             camunda-version: "8.4"
-            compose-args: "-f docker-compose.yaml"
+            main-compose-args: "-f docker-compose.yaml"
             e2e-test-enabled: false
           - name: Camunda 8.4 - Core
             camunda-version: "8.4"
-            compose-args: "-f docker-compose-core.yaml"
+            main-compose-args: "-f docker-compose-core.yaml"
             e2e-test-enabled: false
           - name: Camunda 8.4 - Web Modeler
             camunda-version: "8.4"
-            compose-args: "-f docker-compose-web-modeler.yaml"
+            main-compose-args: "-f docker-compose-web-modeler.yaml"
             e2e-test-enabled: false
           # Camunda 8.5
           - name: Camunda 8.5 ⭐
             camunda-version: "8.5"
-            compose-args: "-f docker-compose.yaml"
+            main-compose-args: "-f docker-compose.yaml"
             e2e-test-enabled: false
           - name: Camunda 8.5 - Core
             camunda-version: "8.5"
-            compose-args: "-f docker-compose-core.yaml"
+            main-compose-args: "-f docker-compose-core.yaml"
             e2e-test-enabled: false
           - name: Camunda 8.5 - Web Modeler
             camunda-version: "8.5"
-            compose-args: "-f docker-compose.yaml -f docker-compose-web-modeler.yaml"
+            deps-compose-args: "--profile identity"
+            main-compose-args: "docker-compose-web-modeler.yaml"
             e2e-test-enabled: false
           # Camunda 8.6
           - name: Camunda 8.6 ⭐
             camunda-version: "8.6"
           - name: Camunda 8.6 - Core
             camunda-version: "8.6"
-            compose-args: "-f docker-compose-core.yaml"
+            main-compose-args: "-f docker-compose-core.yaml"
           - name: Camunda 8.6 - Web Modeler
             camunda-version: "8.6"
-            deps-compose-args: "--profile identity --profile orchestration"
-            compose-args: "-f docker-compose-web-modeler.yaml"
+            deps-compose-args: "--profile identity"
+            main-compose-args: "-f docker-compose-web-modeler.yaml"
             e2e-test-enabled: false
           # Camunda Alpha
           - name: Camunda Alpha ⭐
             camunda-version: "alpha"
-            compose-args: "-f docker-compose.yaml"
+            main-compose-args: "-f docker-compose.yaml"
           - name: Camunda Alpha - Core
             camunda-version: "alpha"
-            compose-args: "-f docker-compose-core.yaml"
+            main-compose-args: "-f docker-compose-core.yaml"
           - name: Camunda Alpha - Web Modeler
             camunda-version: "alpha"
-            deps-compose-args: "--profile identity --profile orchestration"
-            compose-args: "-f docker-compose-web-modeler.yaml"
+            deps-compose-args: "--profile identity"
+            main-compose-args: "-f docker-compose-web-modeler.yaml"
             e2e-test-enabled: false
         exclude: ${{ fromJson(needs.init.outputs.unchanged-versions) }}
     uses: ./.github/workflows/docker-compose-test-e2e-template.yaml
     secrets: inherit
     with:
       camunda-version: ${{ matrix.versions.camunda-version }}
       deps-compose-args: ${{ matrix.versions.deps-compose-args }}
-      compose-args: ${{ matrix.versions.compose-args }}
+      main-compose-args: ${{ matrix.versions.compose-args }}
       e2e-test-enabled: ${{ matrix.versions.e2e-test-enabled }}
diff --git a/.github/workflows/docker-compose-test-e2e-template.yaml b/.github/workflows/docker-compose-test-e2e-template.yaml
@@ -10,7 +10,7 @@ on:
       deps-compose-args:
         description: Arguments supplied to Docker Compose dependencies
         type: string
-      compose-args:
+      main-compose-args:
         description: Arguments supplied to Docker Compose
         required: true
         type: string

diff --git a/docker-compose/versions/camunda-8.5/docker-compose-web-modeler.yaml b/docker-compose/versions/camunda-8.5/docker-compose-web-modeler.yaml
@@ -23,6 +23,9 @@ services:
       - modeler
     volumes:
       - postgres-web:/var/lib/postgresql/data
+    profiles:
+      - ''
+      - web-modeler-standalone
 
   modeler-websockets:
     container_name: modeler-websockets
@@ -42,6 +45,9 @@ services:
       PUSHER_APP_SECRET: modeler-app-secret
     networks:
       - modeler
+    profiles:
+      - ''
+      - web-modeler-standalone
 
   mailpit:
     # If you want to use your own SMTP server, you can remove this container
@@ -57,6 +63,9 @@ services:
       interval: 30s
     networks:
       - modeler
+    profiles:
+      - ''
+      - web-modeler-standalone
 
   # Modeler containers
   modeler-restapi:
@@ -96,6 +105,9 @@ services:
     networks:
     - modeler
     - camunda-platform
+    profiles:
+      - ''
+      - web-modeler-standalone
 
   modeler-webapp:
     container_name: modeler-webapp
@@ -133,6 +145,9 @@ services:
     networks:
       - modeler
       - camunda-platform
+    profiles:
+      - ''
+      - web-modeler-standalone
 
 networks:
   camunda-platform:

diff --git a/docker-compose/versions/camunda-8.5/docker-compose.yaml b/docker-compose/versions/camunda-8.5/docker-compose.yaml
@@ -46,6 +46,9 @@ services:
     depends_on:
       - elasticsearch
       - identity
+    profiles:
+      - ''
+      - orchestration
 
   operate: # https://docs.camunda.io/docs/self-managed/platform-deployment/docker/#operate
     image: camunda/operate:${CAMUNDA_OPERATE_VERSION}
@@ -90,6 +93,9 @@ services:
       - zeebe
       - identity
       - elasticsearch
+    profiles:
+      - ''
+      - orchestration
 
   tasklist: # https://docs.camunda.io/docs/self-managed/platform-deployment/docker/#tasklist
     image: camunda/tasklist:${CAMUNDA_TASKLIST_VERSION}
@@ -138,6 +144,9 @@ services:
         condition: service_healthy
       identity:
         condition: service_healthy
+    profiles:
+      - ''
+      - orchestration
 
   connectors: # https://docs.camunda.io/docs/components/integration-framework/connectors/out-of-the-box-connectors/available-connectors-overview/
     image: camunda/connectors-bundle:${CAMUNDA_CONNECTORS_VERSION}
@@ -173,6 +182,9 @@ services:
       - zeebe
       - operate
       - identity
+    profiles:
+      - ''
+      - orchestration
 
   optimize: # https://docs.camunda.io/docs/self-managed/platform-deployment/docker/#optimize
     image: camunda/optimize:${CAMUNDA_OPTIMIZE_VERSION}
@@ -210,6 +222,9 @@ services:
     depends_on:
       - identity
       - elasticsearch
+    profiles:
+      - ''
+      - orchestration
 
   identity: # https://docs.camunda.io/docs/self-managed/platform-deployment/docker/#identity
     container_name: identity
@@ -278,6 +293,9 @@ services:
     depends_on:
       keycloak:
         condition: service_healthy
+    profiles:
+      - ''
+      - identity
 
   postgres: # https://hub.docker.com/_/postgres
     container_name: postgres
@@ -296,6 +314,9 @@ services:
       - postgres:/var/lib/postgresql/data
     networks:
       - identity-network
+    profiles:
+      - ''
+      - identity
 
   keycloak: # https://hub.docker.com/r/bitnami/keycloak
     container_name: keycloak
@@ -323,6 +344,9 @@ services:
       - identity-network
     depends_on:
       - postgres
+    profiles:
+      - ''
+      - identity
 
   elasticsearch: # https://hub.docker.com/_/elasticsearch
     image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION}
@@ -351,6 +375,9 @@ services:
       - elastic:/usr/share/elasticsearch/data
     networks:
       - camunda-platform
+    profiles:
+      - ''
+      - orchestration
 
   kibana:
     image: docker.elastic.co/kibana/kibana:${ELASTIC_VERSION}