From 02289479ef9fb6fb529b5e38f65418c728ca2502 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Roemer <roemer.jp@gmail.com>
Date: Wed, 21 Oct 2015 16:27:05 +0100
Subject: [PATCH 1/2] Docker `socat` link creation

- `start.sh` will now verify that the port is not already used by another service
- Resolve #1807
- Log when a service is created, or could not be created
- Keep track of which port is already used, including goes & sshd port
---
 docker/start.sh | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/docker/start.sh b/docker/start.sh
index c687515f5df..85a6cfa5d04 100755
--- a/docker/start.sh
+++ b/docker/start.sh
@@ -13,12 +13,24 @@ for f in /data/gogs/data /data/gogs/conf /data/gogs/log /data/git /data/ssh; do
 done
 
 # Bind linked docker container to localhost socket using socat
-env | sed -En 's|(.*)_PORT_([0-9]*)_TCP=tcp://(.*):(.*)|\1_\2 socat -ls TCP4-LISTEN:\2,fork,reuseaddr TCP4:\3:\4|p' | \
-while read NAME CMD; do
-    mkdir -p /app/gogs/docker/s6/SOCAT_$NAME
-    echo -e "#!/bin/sh\nexec $CMD" > /app/gogs/docker/s6/SOCAT_$NAME/run
-    chmod +x /app/gogs/docker/s6/SOCAT_$NAME/run
-done
+USED_PORT="80:443:22"
+while read NAME ADDR PORT; do
+    if test -z "$NAME$ADDR$PORT"; then
+        continue
+    elif echo $USED_PORT | grep -E "(^|:)$PORT($|:)" > /dev/null; then
+        echo "init:socat | Can't bind linked container ${NAME} to localhost, port ${PORT} already in use" 1>&2
+    else
+        SERV_FOLDER=/app/gogs/docker/s6/SOCAT_${NAME}_${PORT}
+        mkdir -p ${SERV_FOLDER}
+        CMD="socat -ls TCP4-LISTEN:${PORT},fork,reuseaddr TCP4:${ADDR}:${PORT}"
+        echo -e "#!/bin/sh\nexec $CMD" > ${SERV_FOLDER}/run
+        chmod +x ${SERV_FOLDER}/run
+        USED_PORT="${USED_PORT}:${PORT}"
+        echo "init:socat | Linked container ${NAME} will be binded to localhost on port ${PORT}" 1>&2
+    fi
+done << EOT
+$(env | sed -En 's|(.*)_PORT_([0-9]+)_TCP=tcp://(.*):([0-9]+)|\1 \3 \4|p')
+EOT
 
 # Exec CMD or S6 by default if nothing present
 if [ $# -gt 0 ];then

From f7c7837fc84198cc0b62551fe2de9b68abd32140 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Roemer <roemer.jp@gmail.com>
Date: Wed, 21 Oct 2015 16:55:55 +0100
Subject: [PATCH 2/2] Docker socat link: default port fix

- Remove port 80 & 443 unused by the container
- Add port 3000 used by gogs application
---
 docker/start.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/start.sh b/docker/start.sh
index 85a6cfa5d04..42bdb3c5417 100755
--- a/docker/start.sh
+++ b/docker/start.sh
@@ -13,7 +13,7 @@ for f in /data/gogs/data /data/gogs/conf /data/gogs/log /data/git /data/ssh; do
 done
 
 # Bind linked docker container to localhost socket using socat
-USED_PORT="80:443:22"
+USED_PORT="3000:22"
 while read NAME ADDR PORT; do
     if test -z "$NAME$ADDR$PORT"; then
         continue