Add syslog & fix `/data/git` rights & SOCAT_LINK env var

- Resolve #1893
- Add syslogd to output sshd log on stdout (via `docker logs`)
- Enforce directory rights on `/data/git`, `/data/gogs` & `/data/ssh`
- Add `SOCAT_LINK` environment variable to prevent the creation of scout links when they are not needed (see #1815)
This commit is contained in:
Jean-Philippe Roemer 2015-11-04 19:19:39 +00:00
parent 603c7389b8
commit 9a8aeef478
4 changed files with 33 additions and 19 deletions

View File

@ -20,3 +20,4 @@ ln -sf /data/gogs/data ./data
ln -sf /data/git /home/git ln -sf /data/git /home/git
chown -R git:git /data /app/gogs ~git/ chown -R git:git /data /app/gogs ~git/
chmod 0755 /data /data/gogs ~git/

View File

@ -23,4 +23,5 @@ fi
# Set correct right to ssh keys # Set correct right to ssh keys
chown -R root:root /data/ssh/* chown -R root:root /data/ssh/*
chmod 600 /data/ssh/* chmod 0700 /data/ssh
chmod 0600 /data/ssh/*

7
docker/s6/syslogd/run Executable file
View File

@ -0,0 +1,7 @@
#!/bin/sh
if test -f ./setup; then
source ./setup
fi
exec gosu root /sbin/syslogd -nS -O-

View File

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