airship
/
armada
Code Issues Proposed changes

Unifying proxy variables for tox and docker build 

This patch adds proxy-related variables to tox and 'docker build'
commands.

Change-Id: Ic87aec9448a16a469bc630f76cf31ed0e34dae4e
This commit is contained in:
Roman Gorshunov 2018-06-22 14:35:19 +02:00
parent 1e97cec611
commit eaaa3d67e5
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -19,6 +19,7 @@ IMAGE_NAME ?= armada
IMAGE_TAG ?= latest
HELM ?= helm
PROXY ?= http://proxy.foo.com:8000
NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local
USE_PROXY ?= false
PUSH_IMAGE ?= false
LABEL ?= commit-id
@ -102,7 +103,13 @@ build_docs:
.PHONY: build_armada
build_armada:
ifeq ($(USE_PROXY), true)
docker build --network host -t $(IMAGE) --label $(LABEL) -f ./Dockerfile . --build-arg http_proxy=$(PROXY) --build-arg https_proxy=$(PROXY)
docker build --network host -t $(IMAGE) --label $(LABEL) -f ./Dockerfile \
--build-arg http_proxy=$(PROXY) \
--build-arg https_proxy=$(PROXY) \
--build-arg HTTP_PROXY=$(PROXY) \
--build-arg HTTPS_PROXY=$(PROXY) \
--build-arg no_proxy=$(NO_PROXY) \
--build-arg NO_PROXY=$(NO_PROXY) .
else
docker build --network host -t $(IMAGE) --label $(LABEL) -f ./Dockerfile .
endif