From cc46274df789387e11f82d9f4bdf8ce90d700ad1 Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Tue, 3 Sep 2024 13:28:05 +0200 Subject: [PATCH] OZG-6616: Fixes from Code-Review --- alfa-client/apps/alfa-e2e/docker-compose.yml | 6 ++---- alfa-client/apps/alfa-e2e/start-e2e-environment.sh | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/alfa-client/apps/alfa-e2e/docker-compose.yml b/alfa-client/apps/alfa-e2e/docker-compose.yml index 6c6004062c..21c6436a25 100644 --- a/alfa-client/apps/alfa-e2e/docker-compose.yml +++ b/alfa-client/apps/alfa-e2e/docker-compose.yml @@ -177,8 +177,7 @@ services: condition: service_healthy zufi-manager-server: - #TODO Ändere mich auf snapshot-latest - image: docker.ozg-sh.de/zufi-manager:master-1.2.0-SNAPSHOT-3c4d2d8 + image: docker.ozg-sh.de/zufi-manager:snapshot-latest platform: linux/amd64 environment: - SPRING_DATA_MONGODB_URI=mongodb://mongodb:27017/local @@ -193,8 +192,7 @@ services: condition: service_completed_successfully zufi-manager: - #TODO Ändere mich auf snapshot-latest - image: docker.ozg-sh.de/zufi-server:master-1.2.0-SNAPSHOT-3c4d2d8 + image: docker.ozg-sh.de/zufi-server:snapshot-latest platform: linux/amd64 environment: - SPRING_DATA_MONGODB_URI=mongodb://mongodb:27017/local diff --git a/alfa-client/apps/alfa-e2e/start-e2e-environment.sh b/alfa-client/apps/alfa-e2e/start-e2e-environment.sh index 93c7bfcec2..4c09f100d1 100755 --- a/alfa-client/apps/alfa-e2e/start-e2e-environment.sh +++ b/alfa-client/apps/alfa-e2e/start-e2e-environment.sh @@ -66,7 +66,7 @@ echo echo echo "Starting VorgangManager and Alfa Server for normal operations." -$DOCKER_COMPOSE_CMD up -d vorgang-manager alfa zufi-manager zufi-manager-pvog +$DOCKER_COMPOSE_CMD up -d vorgang-manager alfa zufi-manager zufi-manager-server waitForServerStarted() { ($DOCKER_COMPOSE_CMD logs | awk 'BEGIN{RS="\0"} /Started AlfaServerApplication/ && /Started VorgangManagerServerApplication/ { exit 1 }') -- GitLab