Skip to content

Commit

Permalink
Fix build issues Close gliderlabs#468
Browse files Browse the repository at this point in the history
  • Loading branch information
Yann DEGAT committed Sep 5, 2016
1 parent 1ed31d8 commit ac47f6f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM gliderlabs/alpine:3.2
FROM gliderlabs/alpine:3.3
ENTRYPOINT ["/bin/registrator"]

COPY . /go/src/github.com/gliderlabs/registrator
RUN apk-install -t build-deps go git mercurial \
RUN apk-install -t build-deps build-base go git mercurial \
&& cd /go/src/github.com/gliderlabs/registrator \
&& export GOPATH=/go \
&& go get \
&& go build -ldflags "-X main.Version $(cat VERSION)" -o /bin/registrator \
&& go build -ldflags "-X main.Version=$(cat VERSION)" -o /bin/registrator \
&& rm -rf /go \
&& apk del --purge build-deps
6 changes: 3 additions & 3 deletions Dockerfile.dev
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM gliderlabs/alpine:3.2
FROM gliderlabs/alpine:3.3
CMD ["/bin/registrator"]

ENV GOPATH /go
RUN apk-install go git mercurial
RUN apk-install build-base go git mercurial
COPY . /go/src/github.com/gliderlabs/registrator
RUN cd /go/src/github.com/gliderlabs/registrator \
&& go get \
&& go build -ldflags "-X main.Version dev" -o /bin/registrator
&& go build -ldflags "-X main.Version=dev" -o /bin/registrator

0 comments on commit ac47f6f

Please sign in to comment.