Update docker testing images and scripts

starburstdata · May 26, 2023 · d281977 · d281977
1 parent 3ecf670
commit d281977
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 41 deletions.
diff --git a/docker/Dockerfile.util b/docker/Dockerfile.util
diff --git a/docker/init_starburst.bash b/docker/init_starburst.bash
@@ -7,6 +7,5 @@ cd ..
 set -exo pipefail
 
 docker-compose -f docker-compose-starburst.yml build
-docker-compose -f docker/util.yml build
 docker-compose -f docker-compose-starburst.yml up -d
-docker-compose -f docker/util.yml run --rm util wait_for_up trino 8080 10
+timeout 5m bash -c -- 'while ! docker-compose -f docker-compose-starburst.yml logs trino 2>&1 | tail -n 1 | grep "SERVER STARTED"; do sleep 2; done'
diff --git a/docker/init_trino.bash b/docker/init_trino.bash
@@ -7,6 +7,5 @@ cd ..
 set -exo pipefail
 
 docker-compose -f docker-compose-trino.yml build
-docker-compose -f docker/util.yml build
 docker-compose -f docker-compose-trino.yml up -d
-docker-compose -f docker/util.yml run --rm util wait_for_up trino 8080
+timeout 5m bash -c -- 'while ! docker-compose -f docker-compose-trino.yml logs trino 2>&1 | tail -n 1 | grep "SERVER STARTED"; do sleep 2; done'
diff --git a/docker/util.yml b/docker/util.yml
diff --git a/docker/wait_for_up.bash b/docker/wait_for_up.bash