airship
/
drydock
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: I29fee630bd4c98406797ffec93f8f80bf1a3a043
This commit is contained in:
Roman Gorshunov 2018-06-22 14:45:51 +02:00
parent b93cf21fa2
commit 7613f1c624
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Makefile
View File

@ -12,17 +12,18 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
BUILD_DIR := $(shell mktemp -d) BUILD_DIR := $(shell mktemp -d)
DOCKER_REGISTRY ?= quay.io DOCKER_REGISTRY ?= quay.io
IMAGE_NAME ?= drydock IMAGE_NAME ?= drydock
IMAGE_PREFIX ?= airshipit IMAGE_PREFIX ?= airshipit
IMAGE_TAG ?= dev IMAGE_TAG ?= dev
HELM := $(BUILD_DIR)/helm HELM := $(BUILD_DIR)/helm
PROXY ?= http://proxy.foo.com:8000 PROXY ?= http://proxy.foo.com:8000
USE_PROXY ?= false NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local
PUSH_IMAGE ?= false USE_PROXY ?= false
LABEL ?= commit-id PUSH_IMAGE ?= false
IMAGE ?= ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG} LABEL ?= commit-id
IMAGE ?= ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}
export export
# Build all docker images for this project # Build all docker images for this project
@ -97,7 +98,13 @@ helm-install:
.PHONY: build_drydock .PHONY: build_drydock
build_drydock: build_drydock:
ifeq ($(USE_PROXY), true) ifeq ($(USE_PROXY), true)
docker build --network host -t $(IMAGE) --label $(LABEL) -f images/drydock/Dockerfile . --build-arg http_proxy=$(PROXY) --build-arg https_proxy=$(PROXY) docker build --network host -t $(IMAGE) --label $(LABEL) -f images/drydock/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 else
docker build --network host -t $(IMAGE) --label $(LABEL) -f images/drydock/Dockerfile . docker build --network host -t $(IMAGE) --label $(LABEL) -f images/drydock/Dockerfile .
endif endif

1
tox.ini
View File

@ -4,6 +4,7 @@ envlist = py35,pep8,bandit
[testenv] [testenv]
setenv = YAMLDIR = {toxinidir}/tests/yaml_samples/ setenv = YAMLDIR = {toxinidir}/tests/yaml_samples/
basepython=python3 basepython=python3
passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
deps= deps=
-rrequirements-lock.txt -rrequirements-lock.txt
-rrequirements-test.txt -rrequirements-test.txt