From de5cab2ed05b65e3fa37b7cb984c32195b931cdf Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Tue, 20 Nov 2018 13:12:52 +0100 Subject: [PATCH] Use wait-for-it --- app/bin/wait.sh | 14 +------------- env/dev.env | 1 + lib/mezzanine | 2 +- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/app/bin/wait.sh b/app/bin/wait.sh index b1f392c6..e9331381 100755 --- a/app/bin/wait.sh +++ b/app/bin/wait.sh @@ -1,15 +1,3 @@ #!/bin/sh -set -e - -port=$(env | grep POSTGRES_PORT | cut -d = -f 2) - -echo -n "waiting for TCP connection to $host:$port..." - -while ! nc -w 1 db $port 2>/dev/null -do - echo -n . - sleep 1 -done - -echo 'ok' +/srv/bin/misc/wait-for-it/wait-for-it.sh -h localhost -p $DB_PORT; diff --git a/env/dev.env b/env/dev.env index d8f775b3..46196615 100644 --- a/env/dev.env +++ b/env/dev.env @@ -1,3 +1,4 @@ POSTGRES_PASSWORD=noodFof2Kna POSTGRES_PORT=5432 +DB_PORT=5432 DEBUG=True \ No newline at end of file diff --git a/lib/mezzanine b/lib/mezzanine index c35fff29..65e3abe4 160000 --- a/lib/mezzanine +++ b/lib/mezzanine @@ -1 +1 @@ -Subproject commit c35fff29273b72a2214bfac83e33e6a5d80b3666 +Subproject commit 65e3abe4637afd8e82a6865b8446506b8743f465 -- 2.39.5