From 0cbf56855aad82ff49952132287a0112f308c728 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Roemer <roemer.jp@gmail.com>
Date: Mon, 16 Nov 2015 16:48:09 +0000
Subject: [PATCH 1/2] Update s6 path following package update

---
 Dockerfile      | 2 +-
 docker/start.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 500a294f3..a7ff05fe3 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/start.sh b/docker/start.sh
index 041beba5b..042bdd05d 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

From 3deddabfd8e877470172f7c025c453a6ed0b13b0 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Roemer <roemer.jp@gmail.com>
Date: Mon, 16 Nov 2015 16:49:40 +0000
Subject: [PATCH 2/2] Add `set -x` & `set -e` to docker/build.sh for better
 debugging

---
 docker/build.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker/build.sh b/docker/build.sh
index cc66f778a..2e59616da 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