github.com/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-12-24 03:35:55 +01:00
Code Releases Wiki Activity

Merge pull request #1758 from 0rax/develop

Browse Source 
Docker Container Restart Fix
This commit is contained in:
无闻 2015-10-10 16:28:59 -04:00
commit 5676fa5b5d
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -35,3 +35,4 @@ docker/docker/Dockerfile
docker/docker/init_gogs.sh docker/docker/init_gogs.sh
gogs.sublime-project gogs.sublime-project
gogs.sublime-workspace gogs.sublime-workspace
.tags*

5
docker/s6/.s6-svscan/finish
View File

@ -1,2 +1,5 @@
#!/bin/sh #!/bin/sh
exec /bin/true
# Cleanup SOCAT services and s6 event folder
rm -rf $(find /app/gogs/docker/s6/ -name 'event')
rm -rf /app/gogs/docker/s6/SOCAT_*

11
docker/start.sh
View File

@ -1,11 +1,16 @@
#!/bin/sh #!/bin/sh
# 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_*
# Bind linked docker container to localhost socket using socat # 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' | \ 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 while read NAME CMD; do
mkdir -p /app/gogs/docker/s6/$NAME mkdir -p /app/gogs/docker/s6/SOCAT_$NAME
echo -e "#!/bin/sh\nexec $CMD" > /app/gogs/docker/s6/$NAME/run echo -e "#!/bin/sh\nexec $CMD" > /app/gogs/docker/s6/SOCAT_$NAME/run
chmod +x /app/gogs/docker/s6/$NAME/run chmod +x /app/gogs/docker/s6/SOCAT_$NAME/run
done done
# Exec CMD or S6 by default if nothing present # Exec CMD or S6 by default if nothing present