aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 4b87331..d4ace71 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,4 @@
-TAG = registry.moccu/gowiki
-
-all: push
+TAG = gowiki
build: clean
docker build -t ${TAG} --rm --no-cache .