From 785736c7424a0c3c294579c68eb11314f5ee3802 Mon Sep 17 00:00:00 2001 From: Steve Durrheimer Date: Thu, 25 Jun 2015 20:59:55 +0200 Subject: [PATCH] Fix Dockerfile with the removal of tools/rulechecker --- Dockerfile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index a2a7db7234..41e19dc80b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,15 +9,15 @@ RUN apk add --update -t build-deps go git mercurial \ && apk add -u musl && rm -rf /var/cache/apk/* \ && cd /go/src/$REPO_PATH \ && 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) \ - -X $REPO_PATH/version.Branch $(git rev-parse --abbrev-ref HEAD) \ - -X $REPO_PATH/version.BuildUser root@$(hostname -f) \ - -X $REPO_PATH/version.BuildDate $(date +%Y%m%d-%H:%M:%S) \ - -X $REPO_PATH/version.GoVersion $(go version | awk '{print substr($3,3)}') \ - " -o /bin/prometheus $REPO_PATH/cmd/prometheus \ - && cd tools/rule_checker && go build -o /bin/rule_checker && cd ../.. \ + && BUILD_FLAGS=" \ + -X $REPO_PATH/version.Version $(cat version/VERSION) \ + -X $REPO_PATH/version.Revision $(git rev-parse --short HEAD) \ + -X $REPO_PATH/version.Branch $(git rev-parse --abbrev-ref HEAD) \ + -X $REPO_PATH/version.BuildUser root@$(hostname -f) \ + -X $REPO_PATH/version.BuildDate $(date +%Y%m%d-%H:%M:%S) \ + -X $REPO_PATH/version.GoVersion $(go version | awk '{print substr($3,3)}')" \ + && go build -ldflags "$BUILD_FLAGS" -o /bin/prometheus $REPO_PATH/cmd/prometheus \ + && go build -ldflags "$BUILD_FLAGS" -o /bin/promtool $REPO_PATH/cmd/promtool \ && mkdir -p /etc/prometheus \ && mv ./documentation/examples/prometheus.yml /etc/prometheus/prometheus.yml \ && mv ./console_libraries/ ./consoles/ /etc/prometheus/ \