From 3cf7d89363e8e3b9b073e71f9408a07b59567e27 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Thu, 26 Dec 2019 20:38:55 -0800 Subject: [PATCH] fix dock and version --- Makefile | 8 ++++---- init/docker/Dockerfile | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index f47e8c89..609141b6 100644 --- a/Makefile +++ b/Makefile @@ -46,10 +46,10 @@ endef PLUGINS:=$(patsubst plugins/%/main.go,%,$(wildcard plugins/*/main.go)) VERSION_LDFLAGS:= \ - -X $(IMPORT_PATH)/vendor/github.com/prometheus/common/version.Branch=$(TRAVIS_BRANCH) \ - -X $(IMPORT_PATH)/vendor/github.com/prometheus/common/version.BuildDate=$(DATE) \ - -X $(IMPORT_PATH)/vendor/github.com/prometheus/common/version.Revision=$(COMMIT) \ - -X $(IMPORT_PATH)/vendor/github.com/prometheus/common/version.Version=$(VERSION)-$(ITERATION) + -X github.com/prometheus/common/version.Branch=$(TRAVIS_BRANCH) \ + -X github.com/prometheus/common/version.BuildDate=$(DATE) \ + -X github.com/prometheus/common/version.Revision=$(COMMIT) \ + -X github.com/prometheus/common/version.Version=$(VERSION)-$(ITERATION) # Makefile targets follow. diff --git a/init/docker/Dockerfile b/init/docker/Dockerfile index c1e21799..cdfeef05 100644 --- a/init/docker/Dockerfile +++ b/init/docker/Dockerfile @@ -25,7 +25,7 @@ RUN apt-get update \ COPY . $GOPATH/src/${IMPORT_PATH} WORKDIR $GOPATH/src/${IMPORT_PATH} -RUN dep ensure --vendor-only \ +RUN go mod vendor \ && CGO_ENABLED=0 make ${BINARY}.${ARCH}.${OS} FROM scratch