diff options
| author | 无闻 <joe2010xtmf@163.com> | 2014-09-03 11:35:59 -0400 |
|---|---|---|
| committer | 无闻 <joe2010xtmf@163.com> | 2014-09-03 11:35:59 -0400 |
| commit | f36f9e07b78d078c89b57437a12c85ea8218fa1c (patch) | |
| tree | a630fadf8744edc8e6bcb462591343d2e7e651e1 /docker | |
| parent | 87b442433c8280672ed77eb5dbcd4b2c0cd3157e (diff) | |
| parent | 7df0794e14e713d359ee79d204d75cc574b02c1f (diff) | |
| download | gitea-f36f9e07b78d078c89b57437a12c85ea8218fa1c.tar.gz gitea-f36f9e07b78d078c89b57437a12c85ea8218fa1c.zip | |
Merge pull request #436 from tstorch/docker-update
docker dev block update
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/blocks/docker_gogs_dev/Dockerfile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/docker/blocks/docker_gogs_dev/Dockerfile b/docker/blocks/docker_gogs_dev/Dockerfile index 1c001e2c06..a016409f52 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/ |