OZG-6301: OZG-6468: New approach to initialize pvog service

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

@@ -196,12 +196,3 @@ services:
     ports:
       - 7080:8080
       - 7081:8081
-
-  smocker-curl:
-    image: alpine/curl
-    volumes:
-      - ./src/fixtures/smocker:/mocks:ro
-    command: >
-      curl -X POST http://smocker:8081/mocks -H 'Content-Type: application/x-yaml' --data-binary @/mocks/pvog-mock.yaml
-    depends_on:
-      - smocker

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

@@ -25,6 +25,7 @@
 
 
 SCRIPT_DIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)
+DOCKER_COMPOSE_CMD="docker compose -f ${SCRIPT_DIR}/docker-compose.yml"
 
 if nc -z localhost 9091 &> /dev/null
 then
@@ -32,7 +33,7 @@ then
 	exit
 fi
 
-echo "Using docker compose -f ${SCRIPT_DIR}/docker-compose.yml ..."
+echo "Using $DOCKER_COMPOSE_CMD ..."
 echo
 
 if [[ "$OSTYPE" == "linux-gnu"* ]]
@@ -40,9 +41,9 @@ then
 	export DOCKER_GATEWAY_HOST=172.17.0.1
 fi
 
-docker compose -f ${SCRIPT_DIR}/docker-compose.yml pull
+$DOCKER_COMPOSE_CMD pull
 
-docker compose -f ${SCRIPT_DIR}/docker-compose.yml up -d mongodb user-manager elastic smocker smocker-curl zufi-manager zufi-manager-pvog --wait
+$DOCKER_COMPOSE_CMD up -d mongodb user-manager elastic smocker --wait
 
 echo
 echo "Starting VorgangManager to init search index."
@@ -51,7 +52,7 @@ SPRING_PROFILE=local,e2e,initSearchIndex docker compose -f ${SCRIPT_DIR}/docker-
 echo
 
 waitForInitSearchIndex() {
-	(docker compose -f ${SCRIPT_DIR}/docker-compose.yml logs | grep -F -q 'Successful filled up index - exiting')
+	($DOCKER_COMPOSE_CMD logs | grep -F -q 'Successful filled up index - exiting')
 }
 
 echo "Waiting for VorgangManager to finish search index initialisation."
@@ -65,10 +66,10 @@ echo
 echo
 echo "Starting VorgangManager and Alfa Server for normal operations."
 
-docker compose -f ${SCRIPT_DIR}/docker-compose.yml up -d vorgang-manager alfa
+$DOCKER_COMPOSE_CMD up -d vorgang-manager alfa
 
 waitForServerStarted() {
-	(docker compose -f ${SCRIPT_DIR}/docker-compose.yml logs | awk 'BEGIN{RS="\0"} /Started AlfaServerApplication/ && /Started VorgangManagerServerApplication/ { exit 1 }')
+	($DOCKER_COMPOSE_CMD logs | awk 'BEGIN{RS="\0"} /Started AlfaServerApplication/ && /Started VorgangManagerServerApplication/ { exit 1 }')
 }
 
 echo
@@ -88,6 +89,11 @@ while [ $(curl -sw '%{http_code}' "http://localhost:7081/version" -o /dev/null)
 done
 
 curl -X POST http://localhost:7081/mocks -H 'Content-Type: application/x-yaml' --data-binary @src/fixtures/smocker/mocks.yaml
+curl -X POST http://localhost:7081/mocks -H 'Content-Type: application/x-yaml' --data-binary @src/fixtures/smocker/pvog-mock.yaml
+
+echo
+echo "Start Zufi"
+$DOCKER_COMPOSE_CMD up zufi-manager zufi-manager-pvog --wait
 
 echo
 echo "done."
\ No newline at end of file