From cf3021eccac305b9291f27668d997a1ecb40b025 Mon Sep 17 00:00:00 2001
From: Ciaran Downey <me@ciarand.me>
Date: Fri, 25 Jul 2014 12:43:44 -0700
Subject: [PATCH 1/2] Add the set -e option to dockerfiles/build.sh
---
dockerfiles/build.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/dockerfiles/build.sh b/dockerfiles/build.sh
index b658db4ecd..4617da1421 100755
--- a/dockerfiles/build.sh
+++ b/dockerfiles/build.sh
@@ -10,6 +10,9 @@ HOST_PORT="YOUR_HOST_PORT" # The port on host, which will be redirected t
# apt source, you can select 'nchc'(mirror in Taiwan) or 'aliyun'(best for mainlance China users) according to your network, if you could connect to the official unbunt mirror in a fast speed, just leave it to "".
APT_SOURCE=""
+# fail immediately if anything goes wrong
+set -e
+
DOCKER_BIN=$(which docker.io || which docker)
if [ -z "$DOCKER_BIN" ] ; then
echo "Please install docker. You can install docker by running \"wget -qO- https://get.docker.io/ | sh\"."
From aea2b54c99f8456c9a5b2aa4585693ec44f0c4f7 Mon Sep 17 00:00:00 2001
From: Ciaran Downey <me@ciarand.me>
Date: Fri, 25 Jul 2014 12:47:41 -0700
Subject: [PATCH 2/2] Use the official Go source, follow redirects
---
dockerfiles/images/gogits/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dockerfiles/images/gogits/Dockerfile b/dockerfiles/images/gogits/Dockerfile
index 1f67d41ed9..a171e15e3b 100644
--- a/dockerfiles/images/gogits/Dockerfile
+++ b/dockerfiles/images/gogits/Dockerfile
@@ -13,7 +13,7 @@ ENV GOPATH /go
RUN apt-get update && apt-get install --yes --force-yes curl git mercurial zip wget ca-certificates build-essential
RUN apt-get install -yq vim sudo
-RUN curl -s http://docker.u.qiniudn.com/go1.2.1.src.tar.gz | tar -v -C /usr/local -xz
+RUN curl -sL https://golang.org/dl/go1.3.linux-amd64.tar.gz | tar -v -C /usr/local -xz
RUN cd /usr/local/go/src && ./make.bash --no-clean 2>&1
RUN go get -u -d github.com/gogits/gogs