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:
parent
b93cf21fa2
commit
7613f1c624
31
Makefile
31
Makefile
@ -12,17 +12,18 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
BUILD_DIR := $(shell mktemp -d)
|
||||
DOCKER_REGISTRY ?= quay.io
|
||||
IMAGE_NAME ?= drydock
|
||||
IMAGE_PREFIX ?= airshipit
|
||||
IMAGE_TAG ?= dev
|
||||
HELM := $(BUILD_DIR)/helm
|
||||
PROXY ?= http://proxy.foo.com:8000
|
||||
USE_PROXY ?= false
|
||||
PUSH_IMAGE ?= false
|
||||
LABEL ?= commit-id
|
||||
IMAGE ?= ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}
|
||||
BUILD_DIR := $(shell mktemp -d)
|
||||
DOCKER_REGISTRY ?= quay.io
|
||||
IMAGE_NAME ?= drydock
|
||||
IMAGE_PREFIX ?= airshipit
|
||||
IMAGE_TAG ?= dev
|
||||
HELM := $(BUILD_DIR)/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
|
||||
IMAGE ?= ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}
|
||||
export
|
||||
|
||||
# Build all docker images for this project
|
||||
@ -97,7 +98,13 @@ helm-install:
|
||||
.PHONY: build_drydock
|
||||
build_drydock:
|
||||
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
|
||||
docker build --network host -t $(IMAGE) --label $(LABEL) -f images/drydock/Dockerfile .
|
||||
endif
|
||||
|
1
tox.ini
1
tox.ini
@ -4,6 +4,7 @@ envlist = py35,pep8,bandit
|
||||
[testenv]
|
||||
setenv = YAMLDIR = {toxinidir}/tests/yaml_samples/
|
||||
basepython=python3
|
||||
passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
|
||||
deps=
|
||||
-rrequirements-lock.txt
|
||||
-rrequirements-test.txt
|
||||
|
Loading…
x
Reference in New Issue
Block a user