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

Default VERBOSE variable to true. Increase startup timer to 10 seconds. Allow configuring the PostgreSQL port.

Browse Source 
Signed-off-by: Michael Price <loneviking72@gmail.com>
This commit is contained in:
Michael Price
2018-07-14 00:12:15 -04:00
parent 6722394e34
commit d78527ec10
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,11 +6,11 @@ set -e
# $ sh get-mayan-edms.sh # $ sh get-mayan-edms.sh
# #
# NOTE: Make sure to verify the contents of the script # NOTE: Make sure to verify the contents of the script
# you downloaded matches the contents of install.sh # you downloaded matches the contents of docker.sh
# located at https://gitlab.com/mayan-edms/mayan-edms/blob/master/contrib/scripts/install/docker.sh # located at https://gitlab.com/mayan-edms/mayan-edms/blob/master/contrib/scripts/install/docker.sh
# before executing. # before executing.
: ${VERBOSE:=false} : ${VERBOSE:=true}
: ${INSTALL_DOCKER:=false} : ${INSTALL_DOCKER:=false}
: ${DELETE_VOLUMES:=false} : ${DELETE_VOLUMES:=false}
: ${DATABASE_USER:=mayan} : ${DATABASE_USER:=mayan}
@@ -19,6 +19,7 @@ set -e
: ${DOCKER_POSTGRES_IMAGE:=postgres:9.5} : ${DOCKER_POSTGRES_IMAGE:=postgres:9.5}
: ${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_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}
@@ -33,6 +34,9 @@ cat << EOF
╚═╝ ╚═╝╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝╚═╝ ╚═══╝ ╚═╝ ╚═╝╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝╚═╝ ╚═══╝
Docker deploy script Docker deploy script
NOTE: Make sure to verify the contents of this script
matches the contents of docker.sh located at https://gitlab.com/mayan-edms/mayan-edms/blob/master/contrib/scripts/install/docker.sh before executing.
EOF EOF
if [ "$VERBOSE" = true ]; then if [ "$VERBOSE" = true ]; then
@@ -46,17 +50,18 @@ echo "DATABASE_PASSWORD: $DATABASE_PASSWORD"
echo "DOCKER_POSTGRES_IMAGE: $DOCKER_POSTGRES_IMAGE" 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_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"
echo "\nStarting in 5 seconds." echo "\nStarting in 10 seconds."
sleep 5 sleep 10
fi fi
if [ "$INSTALL_DOCKER" = true ]; then if [ "$INSTALL_DOCKER" = true ]; then
echo -n "* Installing Docker..." echo -n "* Installing Docker..."
curl -fsSL get.docker.com -o get-docker.sh >/dev/null curl -fsSL get.docker.com -o get-docker.sh >/dev/null
sh get-docker.sh >/dev/null sh get-docker.sh >/dev/null 2>&1
rm get-docker.sh rm get-docker.sh
echo "Done" echo "Done"
fi fi
@@ -88,7 +93,7 @@ echo -n "* Deploying the PostgreSQL container..."
docker run -d \ docker run -d \
--name $DOCKER_POSTGRES_CONTAINER \ --name $DOCKER_POSTGRES_CONTAINER \
--restart=always \ --restart=always \
-p 5432:5432 \ -p $DOCKER_POSTGRES_PORT:5432 \
-e POSTGRES_USER=$DATABASE_USER \ -e POSTGRES_USER=$DATABASE_USER \
-e POSTGRES_DB=$DATABASE_NAME \ -e POSTGRES_DB=$DATABASE_NAME \
-e POSTGRES_PASSWORD=$DATABASE_PASSWORD \ -e POSTGRES_PASSWORD=$DATABASE_PASSWORD \
@@ -110,6 +115,7 @@ docker run -d \
-e MAYAN_DATABASE_NAME=$DATABASE_NAME \ -e MAYAN_DATABASE_NAME=$DATABASE_NAME \
-e MAYAN_DATABASE_PASSWORD=$DATABASE_PASSWORD \ -e MAYAN_DATABASE_PASSWORD=$DATABASE_PASSWORD \
-e MAYAN_DATABASE_USER=$DATABASE_USER \ -e MAYAN_DATABASE_USER=$DATABASE_USER \
-e MAYAN_DATABASE_PORT=$DOCKER_POSTGRES_PORT \
-e MAYAN_DATABASE_CONN_MAX_AGE=60 \ -e MAYAN_DATABASE_CONN_MAX_AGE=60 \
-v $DOCKER_MAYAN_VOLUME:/var/lib/mayan \ -v $DOCKER_MAYAN_VOLUME:/var/lib/mayan \
$DOCKER_MAYAN_IMAGE >/dev/null $DOCKER_MAYAN_IMAGE >/dev/null