Merge pull request #1962 from 0rax/develop

Update S6 Path after Alpine Package update

3 files changed, 4 insertions, 2 deletions

diff --git a/Dockerfile b/Dockerfile
index 500a294f..a7ff05fe 100644
--- a/Dockerfile
+++ b/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/"]
diff --git a/docker/build.sh b/docker/build.sh
index cc66f778..2e59616d 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -1,4 +1,6 @@
 #!/bin/sh
+set -x
+set -e
 
 # Set temp environment vars
 export GOPATH=/tmp/go
diff --git a/docker/start.sh b/docker/start.sh
index 041beba5..042bdd05 100755
--- a/docker/start.sh
+++ b/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