Merge pull request #255 from camptocamp/pgisready

[REM] Replace wait_postgres.sh with pg_isready
camptocamp · Oct 19, 2023 · f8f9764 · f8f9764
2 parents dcf64f7 + 6845ca3
commit f8f9764
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 24 deletions.
diff --git a/bin/docker-entrypoint.sh b/bin/docker-entrypoint.sh
@@ -86,7 +86,7 @@ if [ ! -f "${CONFIG_TARGET}" ]; then
 fi
 
 # Wait until postgres is up
-wait_postgres.sh
+pg_isready
 
 BASE_CMD=$(basename $1)
 CMD_ARRAY=($*)

diff --git a/bin/runmigration b/bin/runmigration
@@ -34,7 +34,7 @@
 #   steps on top of it.
 set -e
 
-wait_postgres.sh
+pg_isready
 CACHE_DIR=${CACHE_DIR:=/tmp/cachedb}
 
 echo $CACHE_DIR

diff --git a/bin/runtests b/bin/runtests
@@ -28,7 +28,8 @@ set -e
 
 # TODO: if we are not in TRAVIS, make a template then run tests on a copy
 
-wait_postgres.sh
+pg_isready
+
 LOCAL_SRC_DIR=/odoo/local-src
 CACHE_DIR=${CACHE_DIR:=/tmp/cachedb}
 

diff --git a/bin/wait_postgres.sh b/bin/wait_postgres.sh