From 7df0794e14e713d359ee79d204d75cc574b02c1f Mon Sep 17 00:00:00 2001
From: Tristan Storch <tstorch@math.uni-bielefeld.de>
Date: Wed, 3 Sep 2014 17:12:38 +0200
Subject: [PATCH] docker dev block update

The dev Dockerfile now works without superfluous go get calls.
At this point the -u option is really not what we want.
---
 docker/blocks/docker_gogs_dev/Dockerfile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docker/blocks/docker_gogs_dev/Dockerfile b/docker/blocks/docker_gogs_dev/Dockerfile
index 1c001e2c06f..a016409f524 100644
--- a/docker/blocks/docker_gogs_dev/Dockerfile
+++ b/docker/blocks/docker_gogs_dev/Dockerfile
@@ -1,8 +1,9 @@
 FROM ubuntu:14.04
 
-# This part is taken from the official docker image --------------------
+# This part is derived from the official docker image ------------------
 
-RUN apt-get update && apt-get install -y \
+RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
+		apt-get install -qy \
 		build-essential ca-certificates curl \
 		bzr git mercurial \
 		--no-install-recommends
@@ -31,10 +32,10 @@ ENV GOGS_PATH $GOPATH/src/github.com/gogits/gogs
 ENV GOGS_CUSTOM_CONF_PATH $GOGS_PATH/custom/conf
 ENV GOGS_CUSTOM_CONF $GOGS_CUSTOM_CONF_PATH/app.ini
 
-RUN go get -u -d github.com/gogits/gogs
+RUN git clone -b dev https://github.com/gogits/gogs.git $GOPATH/src/github.com/gogits/gogs
 # WORKDIR $GOGS_PATH
 WORKDIR /go/src/github.com/gogits/gogs
-RUN git checkout dev; go get -u; git checkout dev; go build
+RUN go get -d && go build
 RUN chown -R git $GOGS_PATH
 
 ADD init_gogs.sh /tmp/