From c0a48327a48a27d34503ac570d5eb28b6a1f94c1 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 29 Aug 2024 11:00:32 +0200
Subject: [PATCH] OZG-6301: OZG-6468: Cleanup docker file and reduce logging in
Elastic.
---
alfa-client/apps/alfa-e2e/docker-compose.yml | 13 +++++++++----
.../apps/alfa-e2e/start-e2e-environment.sh | 15 ---------------
2 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/alfa-client/apps/alfa-e2e/docker-compose.yml b/alfa-client/apps/alfa-e2e/docker-compose.yml
index 3308cfaeb2..acaf147595 100644
--- a/alfa-client/apps/alfa-e2e/docker-compose.yml
+++ b/alfa-client/apps/alfa-e2e/docker-compose.yml
@@ -49,7 +49,7 @@ services:
- OZGCLOUD_ELASTICSEARCH_USESSL=false
- OZGCLOUD_PROCESSORS_0_ADDRESS=http://smocker:5080/externe-processor-success
- OZGCLOUD_PROCESSORS_0_NAME=ticketCheck
- - OZGCLOUD_USER-MANAGER_URL=http://localhost:9092
+ - OZGCLOUD_USER-MANAGER_URL=http://user-manager:9092
- SPRING_DATA_MONGODB_HOST=mongodb
- SPRING_DATA_MONGODB_DATABASE=local
- SPRING_PROFILES_ACTIVE=${SPRING_PROFILE:-local,e2e}
@@ -72,9 +72,13 @@ services:
- 9091:9090
depends_on:
mongodb:
- condition: service_started
+ condition: service_healthy
elastic:
condition: service_healthy
+ smocker:
+ condition: service_healthy
+ user-manager:
+ condition: service_started
alfa:
image: docker.ozg-sh.de/alfa:${ALFA_DOCKER_IMAGE:-snapshot-latest}
@@ -124,6 +128,7 @@ services:
- MEM_LIMIT=1073741824
- xpack.security.enabled=false
- xpack.security.http.ssl.enabled=false
+ - logger.level=WARN
ulimits:
memlock:
soft: -1
@@ -184,7 +189,7 @@ services:
depends_on:
mongodb:
condition: service_healthy
- smocker-curl:
+ smocker-init:
condition: service_completed_successfully
zufi-manager:
@@ -217,7 +222,7 @@ services:
timeout: 5s
retries: 5
- smocker-curl:
+ smocker-init:
image: alpine/curl
volumes:
- ./src/fixtures/smocker:/mocks:ro
diff --git a/alfa-client/apps/alfa-e2e/start-e2e-environment.sh b/alfa-client/apps/alfa-e2e/start-e2e-environment.sh
index 6577b9ea43..93c7bfcec2 100755
--- a/alfa-client/apps/alfa-e2e/start-e2e-environment.sh
+++ b/alfa-client/apps/alfa-e2e/start-e2e-environment.sh
@@ -81,19 +81,4 @@ do
done
echo
-#echo
-#echo "Init smocker"
-#while [ $(curl -sw '%{http_code}' "http://localhost:7081/version" -o /dev/null) -ne 200 ]; do
-# echo -n "."
-# sleep 1
-#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
--
GitLab