mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-25 16:52:40 +01:00
Merge pull request #1758 from 0rax/develop
Docker Container Restart Fix
This commit is contained in:
commit
5676fa5b5d
3 changed files with 13 additions and 4 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -35,3 +35,4 @@ docker/docker/Dockerfile
|
|||
docker/docker/init_gogs.sh
|
||||
gogs.sublime-project
|
||||
gogs.sublime-workspace
|
||||
.tags*
|
||||
|
|
|
@ -1,2 +1,5 @@
|
|||
#!/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_*
|
||||
|
|
|
@ -1,11 +1,16 @@
|
|||
#!/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
|
||||
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/$NAME
|
||||
echo -e "#!/bin/sh\nexec $CMD" > /app/gogs/docker/s6/$NAME/run
|
||||
chmod +x /app/gogs/docker/s6/$NAME/run
|
||||
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
|
||||
|
||||
# Exec CMD or S6 by default if nothing present
|
||||
|
|
Loading…
Reference in a new issue