OZG-4561 OZG-4602: Fix docker-compose; fix start script

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

@@ -36,15 +36,15 @@ services:
     image: docker.ozg-sh.de/vorgang-manager:${VORGANG_MANAGER_DOCKER_IMAGE:-snapshot-latest}
     platform: linux/amd64
     environment:
-      - SPRING_DATA_MONGODB_HOST=ozg-mongodb
+      - SPRING_DATA_MONGODB_HOST=mongodb
       - SPRING_PROFILES_ACTIVE=${SPRING_PROFILE:-dev,e2e}
       - logging_level_org_springframework_security=${LOGGING_LEVEL:-WARN}
-      - OZGCLOUD_ELASTICSEARCH_ADDRESS=ozg-elastic:9200
+      - OZGCLOUD_ELASTICSEARCH_ADDRESS=elastic:9200
       - OZGCLOUD_ELASTICSEARCH_USERNAME=elastic
       - OZGCLOUD_ELASTICSEARCH_PASSWORD=password
       - OZGCLOUD_ELASTICSEARCH_INDEX=e2e-test-index
       - OZGCLOUD_ELASTICSEARCH_USESSL=false
-      - GRPC_CLIENT_USER_MANAGER_ADDRESS=static://ozg-usermanager:9000
+      - GRPC_CLIENT_USER_MANAGER_ADDRESS=static://user-manager:9000
       - GRPC_CLIENT_USER_MANAGER_NEGOTIATION_TYPE=PLAINTEXT
       - OZGCLOUD_USERMANAGER_URL=http://localhost:9092/migration/user
       - OZGCLOUD_PROCESSORS_0_ADDRESS=http://smocker:5080/externe-processor-success
@@ -52,17 +52,17 @@ services:
     ports:
       - 9091:9090
     depends_on:
-      ozg-mongodb:
+      mongodb:
         condition: service_started
-      ozg-elastic:
+      elastic:
         condition: service_healthy
 
   alfa:
-    image: docker.ozg-sh.de/alfa:PR-326-1.17.0-SNAPSHOT
+    image: docker.ozg-sh.de/alfa:${ALFA_DOCKER_IMAGE:-snapshot-latest}
     platform: linux/amd64
     environment:
-      - GRPC_CLIENT_VORGANG_MANAGER_ADDRESS=static://ozg-vorgang-manager:9090
-      - GRPC_CLIENT_USER_MANAGER_ADDRESS=static://ozg-usermanager:9000
+      - 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
       - OZGCLOUD_USER-MANAGER_URL=http://localhost:9092
@@ -80,8 +80,8 @@ services:
     ports:
       - 8080:8080
     depends_on:
-      - ozg-vorgang-manager
-      - ozg-usermanager
+      - vorgang-manager
+      - user-manager
 
   elastic:
     image: docker.elastic.co/elasticsearch/elasticsearch:8.3.2
@@ -108,8 +108,8 @@ services:
       timeout: 10s
       retries: 5
 
-  usermanager:
-    image: docker.ozg-sh.de/user-manager:${USERMANAGER_DOCKER_IMAGE:-snapshot-latest}
+  user-manager:
+    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
@@ -123,7 +123,7 @@ services:
       - 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
-      - QUARKUS_MONGODB_CONNECTION_STRING=mongodb://ozg-mongodb:27017
+      - QUARKUS_MONGODB_CONNECTION_STRING=mongodb://mongodb:27017
       - QUARKUS_MONGODB_DATABASE=usermanager
       - quarkus.log.category."io.quarkus.oidc.runtime.OidcProvider".level=TRACE
       - quarkus.log.category."io.quarkus.oidc.runtime.OidcProvider".min-level=TRACE
@@ -132,7 +132,7 @@ services:
     ports:
       - 9092:8080
     depends_on:
-      - ozg-mongodb
+      - mongodb
 
   smocker:
     image: thiht/smocker

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

@@ -40,12 +40,12 @@ then
 	export DOCKER_GATEWAY_HOST=172.17.0.1
 fi
 
-docker compose -f ${SCRIPT_DIR}/docker-compose.yml up -d ozg-mongodb ozg-usermanager ozg-elastic ozg-smocker --wait
+docker compose -f ${SCRIPT_DIR}/docker-compose.yml up -d mongodb user-manager elastic smocker --wait
 
 echo
 echo "Starting VorgangManager to init search index."
 
-SPRING_PROFILE=dev,e2e,initSearchIndex docker compose -f ${SCRIPT_DIR}/docker-compose.yml up -d ozg-pluto
+SPRING_PROFILE=dev,e2e,initSearchIndex docker compose -f ${SCRIPT_DIR}/docker-compose.yml up -d vorgang-manager
 echo
 
 waitForInitSearchIndex() {
@@ -63,14 +63,14 @@ echo
 echo
 echo "Starting VorgangManager and Alfa Server for normal operations."
 
-SPRING_PROFILE=dev,e2e docker compose -f ${SCRIPT_DIR}/docker-compose.yml up -d ozg-pluto ozg-goofy
+SPRING_PROFILE=dev,e2e docker compose -f ${SCRIPT_DIR}/docker-compose.yml up -d vorgang-manager alfa
 
 waitForServerStarted() {
-	(docker compose -f ${SCRIPT_DIR}/docker-compose.yml logs | awk 'BEGIN{RS="\0"} /Started AlfaServerApplication/ && /Started PlutoServerApplication/ { exit 1 }')
+	(docker compose -f ${SCRIPT_DIR}/docker-compose.yml logs | awk 'BEGIN{RS="\0"} /Started AlfaServerApplication/ && /Started VorgangManagerServerApplication/ { exit 1 }')
 }
 
 echo
-echo "Waiting for Pluto and Alfa Server to log successful start."
+echo "Waiting for VorgangManager and Alfa Server to log successful start."
 while waitForServerStarted
 do
 	echo -n "."