Skip to content
Snippets Groups Projects
Commit 52b72ff3 authored by OZGCloud's avatar OZGCloud
Browse files

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

parent 2d06ffc9
Branches
Tags
No related merge requests found
...@@ -196,12 +196,3 @@ services: ...@@ -196,12 +196,3 @@ services:
ports: ports:
- 7080:8080 - 7080:8080
- 7081:8081 - 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
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
SCRIPT_DIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd) 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 if nc -z localhost 9091 &> /dev/null
then then
...@@ -32,7 +33,7 @@ then ...@@ -32,7 +33,7 @@ then
exit exit
fi fi
echo "Using docker compose -f ${SCRIPT_DIR}/docker-compose.yml ..." echo "Using $DOCKER_COMPOSE_CMD ..."
echo echo
if [[ "$OSTYPE" == "linux-gnu"* ]] if [[ "$OSTYPE" == "linux-gnu"* ]]
...@@ -40,9 +41,9 @@ then ...@@ -40,9 +41,9 @@ then
export DOCKER_GATEWAY_HOST=172.17.0.1 export DOCKER_GATEWAY_HOST=172.17.0.1
fi 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
echo "Starting VorgangManager to init search index." echo "Starting VorgangManager to init search index."
...@@ -51,7 +52,7 @@ SPRING_PROFILE=local,e2e,initSearchIndex docker compose -f ${SCRIPT_DIR}/docker- ...@@ -51,7 +52,7 @@ SPRING_PROFILE=local,e2e,initSearchIndex docker compose -f ${SCRIPT_DIR}/docker-
echo echo
waitForInitSearchIndex() { 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." echo "Waiting for VorgangManager to finish search index initialisation."
...@@ -65,10 +66,10 @@ echo ...@@ -65,10 +66,10 @@ echo
echo echo
echo "Starting VorgangManager and Alfa Server for normal operations." 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() { 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 echo
...@@ -88,6 +89,11 @@ while [ $(curl -sw '%{http_code}' "http://localhost:7081/version" -o /dev/null) ...@@ -88,6 +89,11 @@ while [ $(curl -sw '%{http_code}' "http://localhost:7081/version" -o /dev/null)
done 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/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
echo "done." echo "done."
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment