From d9d67c60cc3d914fb5bf3fd8e9a1050467216a57 Mon Sep 17 00:00:00 2001 From: Pete Birley Date: Fri, 8 Jun 2018 09:27:03 -0500 Subject: [PATCH] Docker: support build behind proxy This PS adds support to build behind a corp proxy. Change-Id: I6dbcb84dc731084bdca29c0561c1fb3694157888 Signed-off-by: Pete Birley --- Makefile | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c92ca4a1..e46c530d 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,9 @@ IMAGE_PREFIX ?= attcomdev IMAGE_NAME ?= armada IMAGE_TAG ?= latest HELM ?= helm +PROXY ?= http://proxy.foo.com:8000 +USE_PROXY ?= false +PUSH_IMAGE ?= false LABEL ?= commit-id PYTHON = python3 CHARTS := $(patsubst charts/%/.,%,$(wildcard charts/*/.)) @@ -98,7 +101,14 @@ build_docs: .PHONY: build_armada build_armada: - docker build -t $(IMAGE) --label $(LABEL) . +ifeq ($(USE_PROXY), true) + docker build --network host -t $(IMAGE) --label $(LABEL) -f ./Dockerfile . --build-arg http_proxy=$(PROXY) --build-arg https_proxy=$(PROXY) +else + docker build --network host -t $(IMAGE) --label $(LABEL) -f ./Dockerfile . +endif +ifeq ($(PUSH_IMAGE), true) + docker push $(IMAGE) +endif # make tools .PHONY: protoc