Skip to content

Commit 9cf5fc0

Browse files
Merge pull request #81 from e0ne/goproxy-makefile
chore: Pass GOPROXY env to Makefile
2 parents fc499b1 + ead82e9 commit 9cf5fc0

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ export WATCH_NAMESPACE?=openshift-sriov-network-operator
3232
export HOME?=$(PWD)
3333
export GOPATH?=$(shell go env GOPATH)
3434
export GO111MODULE=on
35+
GOPROXY ?= $(shell go env GOPROXY)
3536
PKGS=$(shell go list ./... | grep -v -E '/vendor/|/test|/examples')
3637
TESTPKGS?=./...
3738

@@ -71,9 +72,9 @@ clean:
7172
@rm -rf $(BIN_DIR)
7273

7374
image: ; $(info Building images...)
74-
$(IMAGE_BUILDER) build -f $(DOCKERFILE) -t $(IMAGE_TAG) $(CURPATH) $(IMAGE_BUILD_OPTS)
75-
$(IMAGE_BUILDER) build -f $(DOCKERFILE_CONFIG_DAEMON) -t $(CONFIG_DAEMON_IMAGE_TAG) $(CURPATH) $(IMAGE_BUILD_OPTS)
76-
$(IMAGE_BUILDER) build -f $(DOCKERFILE_WEBHOOK) -t $(WEBHOOK_IMAGE_TAG) $(CURPATH) $(IMAGE_BUILD_OPTS)
75+
$(IMAGE_BUILDER) build -f $(DOCKERFILE) -t $(IMAGE_TAG) $(CURPATH) GOPROXY="$(GOPROXY)" $(IMAGE_BUILD_OPTS)
76+
$(IMAGE_BUILDER) build -f $(DOCKERFILE_CONFIG_DAEMON) -t $(CONFIG_DAEMON_IMAGE_TAG) $(CURPATH) GOPROXY="$(GOPROXY)" $(IMAGE_BUILD_OPTS)
77+
$(IMAGE_BUILDER) build -f $(DOCKERFILE_WEBHOOK) -t $(WEBHOOK_IMAGE_TAG) $(CURPATH) GOPROXY="$(GOPROXY)" $(IMAGE_BUILD_OPTS)
7778

7879
# Run tests
7980
test: generate lint manifests envtest

0 commit comments

Comments
 (0)