coolaj86
/
gitroast
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1962 from 0rax/develop 

Update S6 Path after Alpine Package update
This commit is contained in:
Unknwon 2015-11-16 12:11:06 -05:00
parent 917d334ebd 3deddabfd8
commit 54fd4cc5fb
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -19,4 +19,4 @@ RUN ./docker/build.sh
VOLUME ["/data"] VOLUME ["/data"]
EXPOSE 22 3000 EXPOSE 22 3000
ENTRYPOINT ["docker/start.sh"] 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
View File

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

2
docker/start.sh
View File

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