From dcec39ed5c9aea6adbfdd68c9c99e439c0d702e4 Mon Sep 17 00:00:00 2001 From: Knut Ahlers Date: Fri, 13 May 2016 17:30:27 +0200 Subject: [PATCH] Move to go1.6 for building --- Dockerfile | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 61d215e..51116f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,18 @@ -FROM alpine +FROM golang:alpine -VOLUME /data -EXPOSE 3000 -ENV GOPATH /go -ENTRYPOINT ["/go/bin/cloudkeys-go"] -CMD ["--storage=local:////data", "--password-salt=changeme", "--username-salt=changeme"] +MAINTAINER Knut Ahlers ADD . /go/src/github.com/Luzifer/cloudkeys-go WORKDIR /go/src/github.com/Luzifer/cloudkeys-go -RUN apk --update add go git ca-certificates \ - && go get github.com/tools/godep \ - && /go/bin/godep go install -ldflags "-X main.version=$(git describe --tags)" \ - && apk --purge del git go + +RUN set -ex \ + && apk add --update git \ + && go install -ldflags "-X main.version=$(git describe --tags || git rev-parse --short HEAD || echo dev)" \ + && apk del --purge git + +EXPOSE 3000 + +VOLUME ["/data"] + +ENTRYPOINT ["/go/bin/cloudkeys-go"] +CMD ["--storage=local:////data", "--password-salt=changeme", "--username-salt=changeme"]