[db] : add new wait script for restore db

diff --git a/.gitmodules b/.gitmodules
index de78f8d10b96ffbf91bb5379c216a9dc1ef95e3a..85dc45cb0b032e9888fcfc40469b0aafd8b1062d 100644 (file)
--- 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 f50871cae2e1de9bb48d3d109a102e41798c15ae..de93fa3544f039ce454ace32e82fe968f16dec4a 100755 (executable)
--- 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 249c69df0680935380a0e4117279fabe9a8f3441..19a1536d4eb4a45c8a9eb593ba8bd349b3383320 100755 (executable)
--- 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 (submodule)
index 0000000..54d1f0b
--- /dev/null
+++ b/wait-for-it
@@ -0,0 +1 @@
+Subproject commit 54d1f0bfeb6557adf8a3204455389d0901652242