matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make Postgres container wait delay configurable

Browse Source 
Signed-off-by: Roberto Rosario <roberto.rosario@mayan-edms.com>
This commit is contained in:
Roberto Rosario
2019-10-28 00:59:33 -04:00
parent 3bb84fa874
commit 2edacc9a06
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY.rst
View File

@@ -11,6 +11,7 @@
Instead return always False. Instead return always False.
- Enable the main menu workflow runtime link when the workflow view - Enable the main menu workflow runtime link when the workflow view
permission is granted to at least one workflow. permission is granted to at least one workflow.
- Make Postgres container wait delay configurable.
3.2.8 (2019-10-01) 3.2.8 (2019-10-01)
================== ==================

6
contrib/scripts/install/docker.sh
View File

@@ -20,6 +20,7 @@ set -e
: ${DOCKER_POSTGRES_CONTAINER:=mayan-edms-postgres} : ${DOCKER_POSTGRES_CONTAINER:=mayan-edms-postgres}
: ${DOCKER_POSTGRES_VOLUME:=/docker-volumes/mayan-edms/postgres} : ${DOCKER_POSTGRES_VOLUME:=/docker-volumes/mayan-edms/postgres}
: ${DOCKER_POSTGRES_PORT:=5432} : ${DOCKER_POSTGRES_PORT:=5432}
: ${DOCKER_POSTGRES_DELAY:=10}
: ${DOCKER_MAYAN_IMAGE:=mayanedms/mayanedms:latest} : ${DOCKER_MAYAN_IMAGE:=mayanedms/mayanedms:latest}
: ${DOCKER_MAYAN_CONTAINER:=mayan-edms} : ${DOCKER_MAYAN_CONTAINER:=mayan-edms}
: ${DOCKER_MAYAN_VOLUME:=/docker-volumes/mayan-edms/media} : ${DOCKER_MAYAN_VOLUME:=/docker-volumes/mayan-edms/media}
@@ -51,6 +52,7 @@ echo "DOCKER_POSTGRES_IMAGE: $DOCKER_POSTGRES_IMAGE"
echo "DOCKER_POSTGRES_CONTAINER: $DOCKER_POSTGRES_CONTAINER" echo "DOCKER_POSTGRES_CONTAINER: $DOCKER_POSTGRES_CONTAINER"
echo "DOCKER_POSTGRES_VOLUME: $DOCKER_POSTGRES_VOLUME" echo "DOCKER_POSTGRES_VOLUME: $DOCKER_POSTGRES_VOLUME"
echo "DOCKER_POSTGRES_PORT: $DOCKER_POSTGRES_PORT" echo "DOCKER_POSTGRES_PORT: $DOCKER_POSTGRES_PORT"
echo "DOCKER_POSTGRES_DELAY: $DOCKER_POSTGRES_DELAY"
echo "DOCKER_MAYAN_IMAGE: $DOCKER_MAYAN_IMAGE" echo "DOCKER_MAYAN_IMAGE: $DOCKER_MAYAN_IMAGE"
echo "DOCKER_MAYAN_CONTAINER: $DOCKER_MAYAN_CONTAINER" echo "DOCKER_MAYAN_CONTAINER: $DOCKER_MAYAN_CONTAINER"
echo "DOCKER_MAYAN_VOLUME: $DOCKER_MAYAN_VOLUME" echo "DOCKER_MAYAN_VOLUME: $DOCKER_MAYAN_VOLUME"
@@ -106,8 +108,8 @@ docker run -d \
$DOCKER_POSTGRES_IMAGE >/dev/null $DOCKER_POSTGRES_IMAGE >/dev/null
echo "Done" echo "Done"
echo -n "* Waiting for the PostgreSQL container to be ready (10 seconds)..." echo -n "* Waiting for the PostgreSQL container to be ready (${DOCKER_POSTGRES_DELAY} seconds)..."
sleep 10 sleep $DOCKER_POSTGRES_DELAY
echo "Done" echo "Done"
echo -n "* Deploying Mayan EDMS container..." echo -n "* Deploying Mayan EDMS container..."