Fix typo & cleanup start.sh code

release/v1.15
Jean-Philippe Roemer 2015-11-04 19:34:26 +00:00
parent 9a8aeef478
commit 7679aa1a21
1 changed files with 26 additions and 17 deletions

View File

@ -1,21 +1,7 @@
#!/bin/sh #!/bin/sh
# Cleanup SOCAT services and s6 event folder create_socat_links() {
# On start and on shutdown in case container has been killed # Bind linked docker container to localhost socket using socat
rm -rf $(find /app/gogs/docker/s6/ -name 'event')
rm -rf /app/gogs/docker/s6/SOCAT_*
# Create VOLUME subfolder
for f in /data/gogs/data /data/gogs/conf /data/gogs/log /data/git /data/ssh; do
if ! test -d $f; then
mkdir -p $f
fi
done
# Bind linked docker container to localhost socket using socat
LINK=$(echo "$SOCAT_LINK" | tr '[:upper:]' '[:lower:]')
if [ "$LINK" != "false" -a "$LINK" != "0" ]; then
USED_PORT="3000:22" USED_PORT="3000:22"
while read NAME ADDR PORT; do while read NAME ADDR PORT; do
if test -z "$NAME$ADDR$PORT"; then if test -z "$NAME$ADDR$PORT"; then
@ -33,8 +19,31 @@ if [ "$LINK" != "false" -a "$LINK" != "0" ]; then
fi fi
done << EOT done << EOT
$(env | sed -En 's|(.*)_PORT_([0-9]+)_TCP=tcp://(.*):([0-9]+)|\1 \3 \4|p') $(env | sed -En 's|(.*)_PORT_([0-9]+)_TCP=tcp://(.*):([0-9]+)|\1 \3 \4|p')
EOT EOT
}
cleanup() {
# Cleanup SOCAT services and s6 event folder
# On start and on shutdown in case container has been killed
rm -rf $(find /app/gogs/docker/s6/ -name 'event')
rm -rf /app/gogs/docker/s6/SOCAT_*
}
create_volume_subfolder() {
# Create VOLUME subfolder
for f in /data/gogs/data /data/gogs/conf /data/gogs/log /data/git /data/ssh; do
if ! test -d $f; then
mkdir -p $f
fi
done
}
cleanup
create_volume_subfolder
LINK=$(echo "$SOCAT_LINK" | tr '[:upper:]' '[:lower:]')
if [ "$LINK" != "false" -a "$LINK" != "0" ]; then
create_socat_links
fi fi
# Exec CMD or S6 by default if nothing present # Exec CMD or S6 by default if nothing present