From 1cbfb8671cec60e56eefbaa377110f4ca8b8a5f1 Mon Sep 17 00:00:00 2001
From: Roberto Rosario <roberto.rosario@mayan-edms.com>
Date: Fri, 29 Nov 2019 19:02:51 -0400
Subject: [PATCH 1/3] Move funding file to its own folder

Signed-off-by: Roberto Rosario <roberto.rosario@mayan-edms.com>
---
 FUNDING.yml => .github/FUNDING.yml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename FUNDING.yml => .github/FUNDING.yml (100%)

diff --git a/FUNDING.yml b/.github/FUNDING.yml
similarity index 100%
rename from FUNDING.yml
rename to .github/FUNDING.yml

From 23fbc4166a3995279f0baf316d0a5cc94dd731d8 Mon Sep 17 00:00:00 2001
From: Sergios Kefalas <sergiokef@gmail.com>
Date: Sat, 30 Nov 2019 09:19:54 +0000
Subject: [PATCH 2/3] Add Mayan port variable

---
 contrib/scripts/install/docker.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/contrib/scripts/install/docker.sh b/contrib/scripts/install/docker.sh
index e1c611d029..ce464cd3e0 100755
--- a/contrib/scripts/install/docker.sh
+++ b/contrib/scripts/install/docker.sh
@@ -24,6 +24,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
 
@@ -56,6 +57,7 @@ echo "DOCKER_POSTGRES_DELAY: $DOCKER_POSTGRES_DELAY"
 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 "\nStarting in 10 seconds."
 sleep 10
 fi
@@ -116,7 +118,7 @@ echo -n "* Deploying Mayan EDMS container..."
 docker run -d \
 --name $DOCKER_MAYAN_CONTAINER \
 --restart=always \
--p 80:8000 \
+-p $DOCKER_MAYAN_PORT:8000 \
 -e MAYAN_DATABASE_ENGINE=django.db.backends.postgresql \
 -e MAYAN_DATABASE_HOST=172.17.0.1 \
 -e MAYAN_DATABASE_NAME=$DATABASE_NAME \

From e6acd6eb677b9da5942c54aa38eb93c46bead808 Mon Sep 17 00:00:00 2001
From: Sergios Kefalas <sergiokef@gmail.com>
Date: Sat, 30 Nov 2019 09:30:54 +0000
Subject: [PATCH 3/3] Fix also readiness check

---
 contrib/scripts/install/docker.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/scripts/install/docker.sh b/contrib/scripts/install/docker.sh
index ce464cd3e0..0e43cd0430 100755
--- a/contrib/scripts/install/docker.sh
+++ b/contrib/scripts/install/docker.sh
@@ -131,5 +131,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"