Browse Source

Merge pull request #1962 from 0rax/develop

Update S6 Path after Alpine Package update
pull/1986/head
Unknwon 9 years ago
parent
commit
54fd4cc5fb
  1. 2
      Dockerfile
  2. 2
      docker/build.sh
  3. 2
      docker/start.sh

2
Dockerfile

@ -19,4 +19,4 @@ RUN ./docker/build.sh
VOLUME ["/data"]
EXPOSE 22 3000
ENTRYPOINT ["docker/start.sh"]
CMD ["/usr/bin/s6-svscan", "/app/gogs/docker/s6/"]
CMD ["/bin/s6-svscan", "/app/gogs/docker/s6/"]

2
docker/build.sh

@ -1,4 +1,6 @@
#!/bin/sh
set -x
set -e
# Set temp environment vars
export GOPATH=/tmp/go

2
docker/start.sh

@ -52,5 +52,5 @@ fi
if [ $# -gt 0 ];then
exec "$@"
else
exec /usr/bin/s6-svscan /app/gogs/docker/s6/
exec /bin/s6-svscan /app/gogs/docker/s6/
fi

Loading…
Cancel
Save