From 79f9073660a2ae8153f56689e8a4b9e6b40a392e Mon Sep 17 00:00:00 2001 From: Emilie Zawadzki Date: Thu, 15 Nov 2018 17:51:15 +0100 Subject: [PATCH] [db] : add new wait script for restore db --- .gitmodules | 3 +++ dev/local/restore_db.sh | 2 ++ dev/restore_db.sh | 2 +- wait-for-it | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) create mode 160000 wait-for-it diff --git a/.gitmodules b/.gitmodules index de78f8d..85dc45c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "install"] path = install url = https://github.com/yomguy/docker-composition-installer.git +[submodule "wait-for-it"] + path = wait-for-it + url = https://github.com/vishnubob/wait-for-it.git diff --git a/dev/local/restore_db.sh b/dev/local/restore_db.sh index f50871c..de93fa3 100755 --- a/dev/local/restore_db.sh +++ b/dev/local/restore_db.sh @@ -1,5 +1,7 @@ #!/bin/bash +/srv/bin/wait-for-it/wait-for-it.sh -h localhost -p $DB_PORT; + set -e echo "Restoring..." diff --git a/dev/restore_db.sh b/dev/restore_db.sh index 249c69d..19a1536 100755 --- a/dev/restore_db.sh +++ b/dev/restore_db.sh @@ -1,5 +1,5 @@ #!/bin/sh docker-compose up -d db -docker-compose run db bash -c "/srv/bin/misc/wait.sh; /srv/bin/dev/local/restore_db.sh" +docker-compose run db bash -c "/srv/bin/dev/local/restore_db.sh" docker-compose stop db diff --git a/wait-for-it b/wait-for-it new file mode 160000 index 0000000..54d1f0b --- /dev/null +++ b/wait-for-it @@ -0,0 +1 @@ +Subproject commit 54d1f0bfeb6557adf8a3204455389d0901652242 -- 2.39.5