From ae529d86099615c7a78bacb19340fbc320c6ddce Mon Sep 17 00:00:00 2001
From: Ahmed AbouZaid <6760103+aabouzaid@users.noreply.github.com>
Date: Fri, 10 Jan 2025 09:31:22 +0100
Subject: [PATCH] update 8.3

---
 .../docker-compose-test-e2e-full-setup.yaml   |  4 +++
 .../docker-compose-web-modeler.yaml           | 21 ++++++++++++---
 .../versions/camunda-8.3/docker-compose.yaml  | 27 +++++++++++++++++++
 3 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker-compose-test-e2e-full-setup.yaml b/.github/workflows/docker-compose-test-e2e-full-setup.yaml
index 72ed072..5be67bd 100644
--- a/.github/workflows/docker-compose-test-e2e-full-setup.yaml
+++ b/.github/workflows/docker-compose-test-e2e-full-setup.yaml
@@ -81,9 +81,11 @@ jobs:
           # Camunda 8.6
           - name: Camunda 8.6 ⭐
             camunda-version: "8.6"
+            e2e-test-enabled: true
           - name: Camunda 8.6 - Core
             camunda-version: "8.6"
             main-compose-args: "-f docker-compose-core.yaml"
+            e2e-test-enabled: true
           - name: Camunda 8.6 - Web Modeler Standalone
             camunda-version: "8.6"
             deps-compose-args: "--profile identity"
@@ -93,9 +95,11 @@ jobs:
           - name: Camunda Alpha ⭐
             camunda-version: "alpha"
             main-compose-args: "-f docker-compose.yaml"
+            e2e-test-enabled: true
           - name: Camunda Alpha - Core
             camunda-version: "alpha"
             main-compose-args: "-f docker-compose-core.yaml"
+            e2e-test-enabled: true
           - name: Camunda Alpha - Web Modeler Standalone
             camunda-version: "alpha"
             deps-compose-args: "--profile identity"
diff --git a/docker-compose/versions/camunda-8.3/docker-compose-web-modeler.yaml b/docker-compose/versions/camunda-8.3/docker-compose-web-modeler.yaml
index 8d9a927..bee42e5 100644
--- a/docker-compose/versions/camunda-8.3/docker-compose-web-modeler.yaml
+++ b/docker-compose/versions/camunda-8.3/docker-compose-web-modeler.yaml
@@ -21,6 +21,9 @@ services:
       POSTGRES_PASSWORD: modeler-db-password
     networks:
       - modeler
+    profiles:
+      - ''
+      - web-modeler-standalone
 
   modeler-websockets:
     container_name: modeler-websockets
@@ -40,6 +43,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
@@ -55,6 +61,9 @@ services:
       interval: 30s
     networks:
       - modeler
+    profiles:
+      - ''
+      - web-modeler-standalone
 
   # Modeler containers
   modeler-restapi:
@@ -92,8 +101,11 @@ services:
       RESTAPI_MAIL_ENABLE_TLS: "false"
       RESTAPI_MAIL_FROM_ADDRESS: "noreply@example.com"
     networks:
-    - modeler
-    - camunda-platform
+      - modeler
+      - camunda-platform
+    profiles:
+      - ''
+      - web-modeler-standalone
 
   modeler-webapp:
     container_name: modeler-webapp
@@ -133,7 +145,10 @@ services:
     networks:
       - modeler
       - camunda-platform
+    profiles:
+      - ''
+      - web-modeler-standalone
 
 networks:
   camunda-platform:
-  modeler:
\ No newline at end of file
+  modeler:
diff --git a/docker-compose/versions/camunda-8.3/docker-compose.yaml b/docker-compose/versions/camunda-8.3/docker-compose.yaml
index 0fe61c5..a3169c5 100644
--- a/docker-compose/versions/camunda-8.3/docker-compose.yaml
+++ b/docker-compose/versions/camunda-8.3/docker-compose.yaml
@@ -43,6 +43,9 @@ services:
     depends_on:
       - elasticsearch
       - identity
+    profiles:
+      - ''
+      - orchestration
 
   operate: # https://docs.camunda.io/docs/self-managed/platform-deployment/docker/#operate
     image: camunda/operate:${CAMUNDA_PLATFORM_VERSION}
@@ -83,6 +86,9 @@ services:
       - zeebe
       - identity
       - elasticsearch
+    profiles:
+      - ''
+      - orchestration
 
   tasklist: # https://docs.camunda.io/docs/self-managed/platform-deployment/docker/#tasklist
     image: camunda/tasklist:${CAMUNDA_PLATFORM_VERSION}
@@ -126,6 +132,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}
@@ -159,6 +168,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}
@@ -194,6 +206,9 @@ services:
     depends_on:
       - identity
       - elasticsearch
+    profiles:
+      - ''
+      - orchestration
 
   identity: # https://docs.camunda.io/docs/self-managed/platform-deployment/docker/#identity
     container_name: identity
@@ -251,6 +266,9 @@ services:
     depends_on:
       keycloak:
         condition: service_healthy
+    profiles:
+      - ''
+      - identity
 
   postgres: # https://hub.docker.com/_/postgres
     container_name: postgres
@@ -269,6 +287,9 @@ services:
       - postgres:/var/lib/postgresql/data
     networks:
       - identity-network
+    profiles:
+      - ''
+      - identity
 
   keycloak: # https://hub.docker.com/r/bitnami/keycloak
     container_name: keycloak
@@ -295,6 +316,9 @@ services:
       - identity-network
     depends_on:
       - postgres
+    profiles:
+      - ''
+      - identity
 
   elasticsearch: # https://hub.docker.com/_/elasticsearch
     image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION}
@@ -323,6 +347,9 @@ services:
       - elastic:/usr/share/elasticsearch/data
     networks:
       - camunda-platform
+    profiles:
+      - ''
+      - orchestration
 
   kibana:
     image: docker.elastic.co/kibana/kibana:${ELASTIC_VERSION}