summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorJean-Philippe Roemer <roemer.jp@gmail.com>2015-10-21 16:27:05 +0100
committerJean-Philippe Roemer <roemer.jp@gmail.com>2015-10-21 16:27:56 +0100
commit02289479ef9fb6fb529b5e38f65418c728ca2502 (patch)
treef6c8a71b4c94e6c46c5d53e5f9aaed4e4711ff56 /docker
parenteac91a74d87fcd9cfa38fcc9fb67af709a8e7a42 (diff)
downloadgitea-02289479ef9fb6fb529b5e38f65418c728ca2502.tar.gz
gitea-02289479ef9fb6fb529b5e38f65418c728ca2502.zip
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
Diffstat (limited to 'docker')
-rwxr-xr-xdocker/start.sh24
1 files changed, 18 insertions, 6 deletions
diff --git a/docker/start.sh b/docker/start.sh
index c687515f5d..85a6cfa5d0 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