RepoMirrors
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

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

2
Makefile
View File

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