Merge remote-tracking branch 'origin/master'

# Conflicts: # tests/resources/Dockerfile
sirixdb · Jul 13, 2024 · 5f4baf6 · 5f4baf6
2 parents de45544 + 0ea5a63
commit 5f4baf6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/test.sh b/test.sh
@@ -1,6 +1,6 @@
 echo "starting the docker environment"
 docker-compose -f ./tests/resources/docker-compose.yml up -d keycloak
-bash ./tests/resources/wait-for-keycloak.sh
-sleep 5
+# bash ./tests/resources/wait.sh
+sleep 30
 docker-compose -f ./tests/resources/docker-compose.yml up -d server
-sleep 5
+sleep 30
diff --git a/tests/resources/wait.sh b/tests/resources/wait.sh
@@ -1 +1 @@
-bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:8080)" != "200" ]]; do sleep 5; done'
+bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:8080/realms/master)" != "200" ]]; do sleep 5; done'