aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-08-17 05:51:59 +0200
committerDimitri Sokolyuk <demon@dim13.org>2016-08-17 05:51:59 +0200
commit1a5503aabaa62f2921bc5751aa15b8a16583d2b5 (patch)
treea4ba44bce22ff9f021664ebcf661e50cb0691523
parent2b9f6efe9b4e5112dcfbce67f91a08950d95fbf7 (diff)
Switch to onbuild
-rw-r--r--Dockerfile10
-rw-r--r--Makefile4
2 files changed, 4 insertions, 10 deletions
diff --git a/Dockerfile b/Dockerfile
index 812deb5..5295e41 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,8 @@
-FROM golang
+FROM golang:onbuild
ENV LANG=C.UTF-8
ENV TZ=Europe/Berlin
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-RUN go get -u dim13.org/gowiki
-RUN go install dim13.org/gowiki
-WORKDIR /go/src/dim13.org/gowiki
-VOLUME /go/src/dim13.org/gowiki/data
-VOLUME /go/src/dim13.org/gowiki/cert
-ENTRYPOINT /go/bin/gowiki
+VOLUME /go/src/app/data
+VOLUME /go/src/app/cert
EXPOSE 8080
EXPOSE 8443
diff --git a/Makefile b/Makefile
index 2cd2ee2..c2b90df 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,4 @@
-TAG = registry.moccu/gowiki
-
-all: push
+TAG = gowiki
build:
docker build -t ${TAG} --rm --no-cache .