aboutsummaryrefslogtreecommitdiff
path: root/docker/blocks/docker_gogs_dev
diff options
context:
space:
mode:
authorTiago Pires <tandrepires@gmail.com>2015-07-20 14:53:53 +0100
committerTiago Pires <tandrepires@gmail.com>2015-07-20 15:19:46 +0100
commita5f9077e5a7d334e7ec84cedc4d8465ff1e2d910 (patch)
tree51d92bc2af1dce55db5cb6d05f48a19b79e9ad49 /docker/blocks/docker_gogs_dev
parent548b95f7b593d80a241c9a1027eda6b4549ca995 (diff)
Update docker image.
Shrink docker image. Update from fig (deprecated) to docker-compose. Update README.md. Signed-off-by: Tiago Pires <tandrepires@gmail.com>
Diffstat (limited to 'docker/blocks/docker_gogs_dev')
-rw-r--r--docker/blocks/docker_gogs_dev/Dockerfile20
1 files changed, 8 insertions, 12 deletions
diff --git a/docker/blocks/docker_gogs_dev/Dockerfile b/docker/blocks/docker_gogs_dev/Dockerfile
index ce653fbe..a51d165e 100644
--- a/docker/blocks/docker_gogs_dev/Dockerfile
+++ b/docker/blocks/docker_gogs_dev/Dockerfile
@@ -1,24 +1,20 @@
-FROM ubuntu:14.04
+FROM buildpack-deps:trusty-scm
-# This part is derived from the official docker image ------------------
+# This part is taken from the official docker image --------------------
-RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
- apt-get install -qy \
- build-essential ca-certificates curl \
- bzr git mercurial openssh-client\
- --no-install-recommends
+RUN apt-get update && apt-get install -y \
+ 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