Ver código fonte

Merge pull request #327 from ciarand/dev

Update the Docker build's Go source and version
无闻 10 anos atrás
pai
commit
3e23241f58
2 arquivos alterados com 4 adições e 1 exclusões
  1. 3 0
      dockerfiles/build.sh
  2. 1 1
      dockerfiles/images/gogits/Dockerfile

+ 3 - 0
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\"."

+ 1 - 1
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