diff --git a/FUNDING.yml b/.github/FUNDING.yml similarity index 100% rename from FUNDING.yml rename to .github/FUNDING.yml diff --git a/contrib/scripts/install/docker.sh b/contrib/scripts/install/docker.sh index 33663c5f34..b6e852eaba 100755 --- a/contrib/scripts/install/docker.sh +++ b/contrib/scripts/install/docker.sh @@ -28,6 +28,7 @@ set -e : ${DOCKER_MAYAN_IMAGE:=mayanedms/mayanedms:latest} : ${DOCKER_MAYAN_CONTAINER:=mayan-edms} : ${DOCKER_MAYAN_VOLUME:=/docker-volumes/mayan-edms/media} +: ${DOCKER_MAYAN_PORT:=80} cat << EOF @@ -65,6 +66,7 @@ echo "DOCKER_REDIS_PORT: $DOCKER_REDIS_PORT" echo "DOCKER_MAYAN_IMAGE: $DOCKER_MAYAN_IMAGE" echo "DOCKER_MAYAN_CONTAINER: $DOCKER_MAYAN_CONTAINER" echo "DOCKER_MAYAN_VOLUME: $DOCKER_MAYAN_VOLUME" +echo "DOCKER_MAYAN_PORT: $DOCKER_MAYAN_PORT" echo echo "Override any of them by setting them before the script. " echo "Example: INSTALL_DOCKER=true sh get-mayan-edms.sh" @@ -177,7 +179,7 @@ docker run -d \ --name $DOCKER_MAYAN_CONTAINER \ $NETWORK_ARGUMENT \ --restart=always \ --p 80:8000 \ +-p $DOCKER_MAYAN_PORT:8000 \ -e MAYAN_DATABASE_ENGINE=django.db.backends.postgresql \ $MAYAN_DATABASE_HOST_ARGUMENT \ $MAYAN_DATABASE_PORT_ARGUMENT \ @@ -192,5 +194,5 @@ $DOCKER_MAYAN_IMAGE >/dev/null echo "Done" echo -n "* Waiting for the Mayan EDMS container to be ready (might take a few minutes)..." -while ! curl --output /dev/null --silent --head --fail http://localhost:80; do sleep 1 && echo -n .; done; +while ! curl --output /dev/null --silent --head --fail http://localhost:$DOCKER_MAYAN_PORT; do sleep 1 && echo -n .; done; echo "Done"