mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-21 12:44:49 -05:00
Docker Container Restart Fix
- Fix s6 fifodir error on container restart - Add .tags* to .gitignore (Atom auto ctags generation)
This commit is contained in:
parent
2020bafee1
commit
fc427432ed
4 changed files with 14 additions and 5 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*
|
||||
|
|
|
@ -2,7 +2,7 @@ FROM alpine:3.2
|
|||
MAINTAINER roemer.jp@gmail.com
|
||||
|
||||
# Install system utils & Gogs runtime dependencies
|
||||
ADD https://github.com/tianon/gosu/releases/download/1.5/gosu-amd64 /usr/sbin/gosu
|
||||
ADD https://github.com/tianon/gosu/releases/download/1.6/gosu-amd64 /usr/sbin/gosu
|
||||
RUN echo "@edge http://dl-4.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories \
|
||||
&& echo "@community http://dl-4.alpinelinux.org/alpine/edge/community" | tee -a /etc/apk/repositories \
|
||||
&& apk -U --no-progress upgrade \
|
||||
|
|
|
@ -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