Simplify Go dependency handling in Dockerfile.

Also, put quotes around the GOPATH in the Makefile for safety in case of
spaces, etc.
This commit is contained in:
Julius Volz 2015-06-23 23:58:09 +02:00
parent f149389d29
commit c69b733956
2 changed files with 2 additions and 3 deletions

View File

@ -7,9 +7,8 @@ COPY . /go/src/github.com/prometheus/prometheus
RUN apk add --update -t build-deps go git mercurial \
&& apk add -u musl && rm -rf /var/cache/apk/* \
&& go get github.com/tools/godep \
&& cd /go/src/$REPO_PATH \
&& $GOPATH/bin/godep restore && go get -d \
&& cp -a ./Godeps/_workspace/* "$GOPATH" \
&& go build -ldflags " \
-X $REPO_PATH/version.Version $(cat version/VERSION) \
-X $REPO_PATH/version.Revision $(git rev-parse --short HEAD) \

View File

@ -66,7 +66,7 @@ $(SELFLINK): $(GOPATH)
ln -s $(MAKEFILE_DIR) $@
$(GOPATH):
cp -a $(MAKEFILE_DIR)/Godeps/_workspace $(GOPATH)
cp -a $(MAKEFILE_DIR)/Godeps/_workspace "$(GOPATH)"
dependencies: $(GOCC) | $(SELFLINK)