From 3519eedaafcf4450925c8d0553dd7ba6445220b5 Mon Sep 17 00:00:00 2001 From: Luis Sanchez Date: Fri, 10 Jan 2020 15:51:08 -0500 Subject: [PATCH] force use of vendor --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index f6f013844..c747991a0 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ DELETE ?= "gcloud container images delete" .PHONY: test test: - go test ./pkg/... + GO111MODULE=on go test -mod=vendor ./pkg/... .PHONY: all all: @@ -31,19 +31,19 @@ endif .PHONY: all-containers all-containers: - CGO_ENABLED=0 GOOS=linux go build -ldflags "-X github.com/kubernetes-sigs/kube-storage-version-migrator/pkg/version.VERSION=$(VERSION)" -a -installsuffix cgo -o cmd/initializer/initializer ./cmd/initializer + CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -mod=vendor -ldflags "-X github.com/kubernetes-sigs/kube-storage-version-migrator/pkg/version.VERSION=$(VERSION)" -a -installsuffix cgo -o cmd/initializer/initializer ./cmd/initializer docker build --no-cache -t $(REGISTRY)/storage-version-migration-initializer:$(VERSION) cmd/initializer rm cmd/initializer/initializer - CGO_ENABLED=0 GOOS=linux go build -ldflags "-X github.com/kubernetes-sigs/kube-storage-version-migrator/pkg/version.VERSION=$(VERSION)" -a -installsuffix cgo -o cmd/migrator/migrator ./cmd/migrator + CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -mod=vendor -ldflags "-X github.com/kubernetes-sigs/kube-storage-version-migrator/pkg/version.VERSION=$(VERSION)" -a -installsuffix cgo -o cmd/migrator/migrator ./cmd/migrator docker build --no-cache -t $(REGISTRY)/storage-version-migration-migrator:$(VERSION) cmd/migrator rm cmd/migrator/migrator - CGO_ENABLED=0 GOOS=linux go build -ldflags "-X github.com/kubernetes-sigs/kube-storage-version-migrator/pkg/version.VERSION=$(VERSION)" -a -installsuffix cgo -o cmd/trigger/trigger ./cmd/trigger + CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -mod=vendor -ldflags "-X github.com/kubernetes-sigs/kube-storage-version-migrator/pkg/version.VERSION=$(VERSION)" -a -installsuffix cgo -o cmd/trigger/trigger ./cmd/trigger docker build --no-cache -t $(REGISTRY)/storage-version-migration-trigger:$(VERSION) cmd/trigger rm cmd/trigger/trigger .PHONY: e2e-test e2e-test: - CGO_ENABLED=0 GOOS=linux go test -c -o ./test/e2e/e2e.test ./test/e2e + CGO_ENABLED=0 GOOS=linux GO111MODULE=on go test -mod=vendor -c -o ./test/e2e/e2e.test ./test/e2e .PHONY: local-manifests local-manifests: