diff options
| author | Unknwon <u@gogs.io> | 2015-07-25 00:49:40 +0800 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-07-25 00:49:40 +0800 |
| commit | 54b58e988d4fac4a3f67feef39d62134352fb07c (patch) | |
| tree | db32c6c6860f6b6bacb0c90c32a25b5a3b7c8002 /docker/blocks/docker_gogs/Dockerfile | |
| parent | dc4aab9925b46f8ad4b18f7926e2904163c1c5b5 (diff) | |
| parent | 70d44e9565e372c73d4f0f42273d4899e8e07f75 (diff) | |
| download | gitea-54b58e988d4fac4a3f67feef39d62134352fb07c.tar.gz gitea-54b58e988d4fac4a3f67feef39d62134352fb07c.zip | |
Merge branch 'develop' of github.com:gogits/gogs into feature/page_issues
Diffstat (limited to 'docker/blocks/docker_gogs/Dockerfile')
| -rw-r--r-- | docker/blocks/docker_gogs/Dockerfile | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/docker/blocks/docker_gogs/Dockerfile b/docker/blocks/docker_gogs/Dockerfile index efedc31a80..1b58fbcf92 100644 --- a/docker/blocks/docker_gogs/Dockerfile +++ b/docker/blocks/docker_gogs/Dockerfile @@ -1,23 +1,20 @@ -FROM ubuntu:14.04 +FROM buildpack-deps:trusty-scm # This part is taken from the official docker image -------------------- RUN apt-get update && apt-get install -y \ - build-essential ca-certificates curl \ - bzr git mercurial openssh-client\ - --no-install-recommends + build-essential --no-install-recommends ENV GOLANG_VERSION 1.3 -RUN curl -sSL http://golang.org/dl/go$GOLANG_VERSION.src.tar.gz \ - | tar -v -C /usr/src -xz -WORKDIR /usr/src/go +RUN curl -sSL https://golang.org/dl/go$GOLANG_VERSION.src.tar.gz \ + | tar -v -C /usr/src -xz -RUN cd src && ./make.bash --no-clean 2>&1 +RUN cd /usr/src/go/src && ./make.bash --no-clean 2>&1 ENV PATH /usr/src/go/bin:$PATH -RUN mkdir -p /go/src +RUN mkdir -p /go/src /go/bin && chmod -R 777 /go ENV GOPATH /go ENV PATH /go/bin:$PATH WORKDIR /go |