summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcrystaldust <juzhenatpku@gmail.com>2014-04-22 10:19:23 +0000
committercrystaldust <juzhenatpku@gmail.com>2014-04-22 10:19:23 +0000
commit65ad26feba64ce88cee71af7ec0cc2bea17084bc (patch)
tree095bea4a39f905079c1897a833d7b867aeb729d0
parentb60d5ecc3e09d242c6c5d48e9a7714563282c6d9 (diff)
downloadgitea-65ad26feba64ce88cee71af7ec0cc2bea17084bc.tar.gz
gitea-65ad26feba64ce88cee71af7ec0cc2bea17084bc.zip
Checkout to the latest dev branch when building the gogs docker image.
-rw-r--r--dockerfiles/images/gogits/Dockerfile7
1 files changed, 3 insertions, 4 deletions
diff --git a/dockerfiles/images/gogits/Dockerfile b/dockerfiles/images/gogits/Dockerfile
index 6a734c13da..25d1dd5e5c 100644
--- a/dockerfiles/images/gogits/Dockerfile
+++ b/dockerfiles/images/gogits/Dockerfile
@@ -13,14 +13,13 @@ ENV GOROOT /usr/local/go
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
RUN curl -s http://docker.u.qiniudn.com/go1.2.1.src.tar.gz | tar -v -C /usr/local -xz
RUN cd /usr/local/go/src && ./make.bash --no-clean 2>&1
-# You may need a proxy, if github is very slow.
-#RUN http_proxy=106.187.38.45:3128 go get -u github.com/gogits/gogs
-RUN go get -u github.com/gogits/gogs
-RUN cd $GOPATH/src/github.com/gogits/gogs && go build
+RUN go get -u -d github.com/gogits/gogs
+RUN cd $GOPATH/src/github.com/gogits/gogs && git checkout dev && git pull origin dev && go install && go build -tags redis
# Clean all the unused packages
RUN apt-get autoremove -y