diff --git a/HISTORY.rst b/HISTORY.rst index 21e0a5ee66..69362d690f 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -99,6 +99,7 @@ indexes, parsing, documents, metadata, ocr, permission, user management. - Split document app links. +- Make Postgres container wait delay configurable. 3.2.9 (2019-XX-XX) ================== diff --git a/contrib/scripts/install/docker.sh b/contrib/scripts/install/docker.sh index af81926b8f..33663c5f34 100755 --- a/contrib/scripts/install/docker.sh +++ b/contrib/scripts/install/docker.sh @@ -21,6 +21,7 @@ set -e : ${DOCKER_POSTGRES_CONTAINER:=mayan-edms-postgres} : ${DOCKER_POSTGRES_VOLUME:=/docker-volumes/mayan-edms/postgres} : ${DOCKER_POSTGRES_PORT:=5432} +: ${DOCKER_POSTGRES_DELAY:=10} : ${DOCKER_REDIS_IMAGE:=redis:5.0-alpine} : ${DOCKER_REDIS_CONTAINER:=mayan-edms-redis} : ${DOCKER_REDIS_PORT:=6379} @@ -57,6 +58,7 @@ echo "DOCKER_POSTGRES_IMAGE: $DOCKER_POSTGRES_IMAGE" echo "DOCKER_POSTGRES_CONTAINER: $DOCKER_POSTGRES_CONTAINER" echo "DOCKER_POSTGRES_VOLUME: $DOCKER_POSTGRES_VOLUME" echo "DOCKER_POSTGRES_PORT: $DOCKER_POSTGRES_PORT" +echo "DOCKER_POSTGRES_DELAY: $DOCKER_POSTGRES_DELAY" echo "DOCKER_REDIS_IMAGE: $DOCKER_REDIS_IMAGE" echo "DOCKER_REDIS_CONTAINER: $DOCKER_REDIS_CONTAINER" echo "DOCKER_REDIS_PORT: $DOCKER_REDIS_PORT" @@ -166,8 +168,8 @@ redis-server \ >/dev/null echo "Done" -echo -n "* Waiting for the PostgreSQL container to be ready (10 seconds)..." -sleep 10 +echo -n "* Waiting for the PostgreSQL container to be ready (${DOCKER_POSTGRES_DELAY} seconds)..." +sleep $DOCKER_POSTGRES_DELAY echo "Done" echo -n "* Deploying Mayan EDMS container..."