OZG-4561 Update docker-compose.yml

alfa-client/apps/alfa-e2e/docker-compose.yml

@@ -36,20 +36,19 @@ services:
     image: docker.ozg-sh.de/vorgang-manager:${VORGANG_MANAGER_DOCKER_IMAGE:-snapshot-latest}
     platform: linux/amd64
     environment:
-      - SPRING_DATA_MONGODB_HOST=mongodb
-      - SPRING_PROFILES_ACTIVE=${SPRING_PROFILE:-dev,e2e}
+      - GRPC_CLIENT_USER_MANAGER_ADDRESS=static://user-manager:9000
+      - GRPC_CLIENT_USER_MANAGER_NEGOTIATION_TYPE=PLAINTEXT
       - logging_level_org_springframework_security=${LOGGING_LEVEL:-WARN}
       - OZGCLOUD_ELASTICSEARCH_ADDRESS=elastic:9200
-      - OZGCLOUD_ELASTICSEARCH_USERNAME=elastic
-      - OZGCLOUD_ELASTICSEARCH_PASSWORD=password
       - OZGCLOUD_ELASTICSEARCH_INDEX=e2e-test-index
+      - OZGCLOUD_ELASTICSEARCH_PASSWORD=password
+      - OZGCLOUD_ELASTICSEARCH_USERNAME=elastic
       - OZGCLOUD_ELASTICSEARCH_USESSL=false
-      - GRPC_CLIENT_USER_MANAGER_ADDRESS=static://user-manager:9000
-      - GRPC_CLIENT_USER_MANAGER_NEGOTIATION_TYPE=PLAINTEXT
-      - OZGCLOUD_USERMANAGER_URL=http://localhost:9092/migration/user
-      - KOP_USERMANAGER_URL=http://localhost:9092/migration/user
       - OZGCLOUD_PROCESSORS_0_ADDRESS=http://smocker:5080/externe-processor-success
       - OZGCLOUD_PROCESSORS_0_NAME=ticketCheck
+      - OZGCLOUD_USER-MANAGER_URL=http://localhost:9092
+      - SPRING_DATA_MONGODB_HOST=mongodb
+      - SPRING_PROFILES_ACTIVE=${SPRING_PROFILE:-dev,e2e}
     ports:
       - 9091:9090
     depends_on:
@@ -62,21 +61,22 @@ services:
     image: docker.ozg-sh.de/alfa:${ALFA_DOCKER_IMAGE:-snapshot-latest}
     platform: linux/amd64
     environment:
-      - GRPC_CLIENT_VORGANG_MANAGER_ADDRESS=static://vorgang-manager:9090
-      - GRPC_CLIENT_USER_MANAGER_ADDRESS=static://user-manager:9000
-      - GRPC_CLIENT_USER_MANAGER_NEGOTIATION_TYPE=PLAINTEXT
-      - SPRING_PROFILES_ACTIVE=remotekc, e2e
+      - GRPC_CLIENT_PLUTO_ADDRESS=static://vorgang-manager:9090 # TODO: Entfernen sobald GRPC_CLIENT_VORGANG-MANAGER_ADDRESS existiert
+      - GRPC_CLIENT_USER-MANAGER_ADDRESS=static://user-manager:9000
+      - GRPC_CLIENT_USER-MANAGER_NEGOTIATION_TYPE=PLAINTEXT
+      - GRPC_CLIENT_VORGANG-MANAGER_ADDRESS=static://vorgang-manager:9090
+      - KEYCLOAK_AUTH_SERVER_URL=https://sso.dev.by.ozg-cloud.de
       - KEYCLOAK_REALM=${KEYCLOAK_REALM:-by-e2e-local-dev}
       - KEYCLOAK_RESOURCE=${KEYCLOAK_CLIENT:-alfa}
-      - KEYCLOAK_AUTH_SERVER_URL=https://sso.dev.by.ozg-cloud.de
-      - OZGCLOUD_USER-ASSISTANCE_DOCUMENTATION_URL=/assets/benutzerleitfaden/Benutzerleitfaden_2.5.pdf
       - OZGCLOUD_FEATURE_VORGANG_EXPORT=true
-      - OZGCLOUD_VORGANG_PROCESSOR_0_FORM_ID=Erstattung_ERFOLG
+      - OZGCLOUD_USER-ASSISTANCE_DOCUMENTATION_URL=/assets/benutzerleitfaden/Benutzerleitfaden_2.5.pdf
+      - OZGCLOUD_USER-MANAGER_URL=http://localhost:9092
       - OZGCLOUD_VORGANG_PROCESSOR_0_FORM_ENGINE_NAME=AFM
-      - OZGCLOUD_VORGANG_PROCESSOR_1_FORM_ID=Erstattung_FAIL
+      - OZGCLOUD_VORGANG_PROCESSOR_0_FORM_ID=Erstattung_ERFOLG
       - OZGCLOUD_VORGANG_PROCESSOR_1_FORM_ENGINE_NAME=AFM
+      - OZGCLOUD_VORGANG_PROCESSOR_1_FORM_ID=Erstattung_FAIL
       - OZGCLOUD_VORGANG_PROCESSOR_NAMES_0=ticketCheck
-      - KOP_USER-MANAGER_URL=http://localhost:9092
+      - SPRING_PROFILES_ACTIVE=remotekc, e2e
     ports:
       - 8080:8080
     depends_on:
@@ -89,10 +89,10 @@ services:
       - 9200:9200
       - 9300:9300
     environment:
+      - discovery.type=single-node
       - ELASTIC_PASSWORD=password
-      - MEM_LIMIT=1073741824
       - ES_JAVA_OPTS=-Xms1g -Xmx1g
-      - discovery.type=single-node
+      - MEM_LIMIT=1073741824
       - xpack.security.enabled=false
       - xpack.security.http.ssl.enabled=false
     ulimits:
@@ -112,23 +112,24 @@ services:
     image: docker.ozg-sh.de/user-manager:${USER_MANAGER_DOCKER_IMAGE:-snapshot-latest}
     platform: linux/amd64
     environment:
-      - QUARKUS_HTTP_CORS_ORIGINS=http://localhost:4300,http://127.0.0.1:4300,https://e2e.dev.by.ozg-cloud.de
-      - QUARKUS_OIDC_AUTH_SERVER_URL=https://sso.dev.by.ozg-cloud.de/realms/${KEYCLOAK_REALM:-by-e2e-local-dev}
-      - QUARKUS_LOG_CONSOLE_JSON=false
-      - QUARKUS_OIDC_CLIENT_ID=alfa
-      - OZGCLOUD_KEYCLOAK_API_USER=usermanagerapiuser
+      - KEYCLOAK_URL=https://sso.dev.by.ozg-cloud.de
+      - OZGCLOUD_KEYCLOAK_API_CLIENT=alfa
       - OZGCLOUD_KEYCLOAK_API_PASSWORD= 
       - OZGCLOUD_KEYCLOAK_API_REALM=${KEYCLOAK_REALM:-by-e2e-local-dev}
-      - OZGCLOUD_KEYCLOAK_API_CLIENT=alfa
+      - OZGCLOUD_KEYCLOAK_API_USER=usermanagerapiuser
       - OZGCLOUD_KEYCLOAK_SYNC_CRON={OZGCLOUD_KEYCLOAK_SYNC_CRON:-disabled}
-      - KEYCLOAK_URL=https://sso.dev.by.ozg-cloud.de
-      - OZGCLOUD_USER_MANAGER_URL=http://localhost:9092
+      - OZGCLOUD_USER-MANAGER_URL=http://localhost:9092
+      - OZGCLOUD_USERSYNC_PERIOD=disabled
+      - QUARKUS_GRPC_SERVER_SSL_CERTIFICATE=
+      - QUARKUS_GRPC_SERVER_SSL_KEY=
+      - QUARKUS_HTTP_CORS_ORIGINS=http://localhost:4300,http://127.0.0.1:4300,https://e2e.dev.by.ozg-cloud.de
+      - QUARKUS_LOG_CONSOLE_JSON=false
       - QUARKUS_MONGODB_CONNECTION_STRING=mongodb://mongodb:27017
       - QUARKUS_MONGODB_DATABASE=usermanager
+      - QUARKUS_OIDC_AUTH_SERVER_URL=https://sso.dev.by.ozg-cloud.de/realms/${KEYCLOAK_REALM:-by-e2e-local-dev}
+      - QUARKUS_OIDC_CLIENT_ID=alfa
       - quarkus.log.category."io.quarkus.oidc.runtime.OidcProvider".level=TRACE
       - quarkus.log.category."io.quarkus.oidc.runtime.OidcProvider".min-level=TRACE
-      - QUARKUS_GRPC_SERVER_SSL_CERTIFICATE=
-      - QUARKUS_GRPC_SERVER_SSL_KEY=
     ports:
       - 9092:8080
     depends_on:

alfa-client/apps/alfa-e2e/stop-e2e-environment.sh

@@ -29,4 +29,4 @@ SCRIPT_DIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)
 echo "Using docker compose -f ${SCRIPT_DIR}/docker-compose.yml ..."
 echo
 
-docker compose -f ${SCRIPT_DIR}/docker-compose.yml down --volumes
+docker compose -f ${SCRIPT_DIR}/docker-compose.yml down --volumes --remove-orphans