diff --git a/alfa-client/apps/alfa-e2e/docker-compose.yml b/alfa-client/apps/alfa-e2e/docker-compose.yml index 55b84abeda18c7c04c75da79cff584fb70f53efa..fc0bb1476055b3067a232095fb0c74b355ae3e15 100644 --- a/alfa-client/apps/alfa-e2e/docker-compose.yml +++ b/alfa-client/apps/alfa-e2e/docker-compose.yml @@ -45,7 +45,7 @@ services: - OZGCLOUD_PROCESSORS_0_NAME=ticketCheck - OZGCLOUD_USER-MANAGER_URL=http://localhost:9092 - SPRING_DATA_MONGODB_HOST=mongodb - - SPRING_PROFILES_ACTIVE=${SPRING_PROFILE:-dev,e2e} + - SPRING_PROFILES_ACTIVE=${SPRING_PROFILE:-local,e2e} - LOGGING_CONFIG=classpath:log4j2-local.xml ports: - 9091:9090 diff --git a/alfa-client/apps/alfa-e2e/start-e2e-environment.sh b/alfa-client/apps/alfa-e2e/start-e2e-environment.sh index 313de4ccbb708485a795958aee88f6e1c945dc01..32720f469eb17d82a17d60713992a8907a528946 100755 --- a/alfa-client/apps/alfa-e2e/start-e2e-environment.sh +++ b/alfa-client/apps/alfa-e2e/start-e2e-environment.sh @@ -45,7 +45,7 @@ docker compose -f ${SCRIPT_DIR}/docker-compose.yml up -d mongodb user-manager el echo echo "Starting VorgangManager to init search index." -SPRING_PROFILE=dev,e2e,initSearchIndex docker compose -f ${SCRIPT_DIR}/docker-compose.yml up -d vorgang-manager +SPRING_PROFILE=local,e2e,initSearchIndex docker compose -f ${SCRIPT_DIR}/docker-compose.yml up -d vorgang-manager echo waitForInitSearchIndex() { @@ -63,7 +63,7 @@ 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 vorgang-manager alfa +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 VorgangManagerServerApplication/ { exit 1 }')