diff --git a/Makefile b/Makefile index 58bfd9b3c..993a69080 100644 --- a/Makefile +++ b/Makefile @@ -121,6 +121,11 @@ build-with-docker: prepare-docker-build-image ## Build inside a Docker container -e GIT_COMMIT=${GIT_COMMIT} \ -e BUILD_NUMBER=${BUILD_NUMBER} \ -e BUILD_URL=${BUILD_URL} \ + -e http_proxy="${HTTP_PROXY}" \ + -e HTTP_PROXY="${HTTP_PROXY}" \ + -e https_proxy="${HTTPS_PROXY}" \ + -e HTTPS_PROXY="${HTTPS_PROXY}" \ + -e NO_PROXY="${NO_PROXY}" \ ${DOCKER_BUILDER_IMAGE_NAME} \ make build @@ -133,6 +138,11 @@ test-with-docker: prepare-docker-build-image create-docker-test-db ## Run tests -e GIT_COMMIT=${GIT_COMMIT} \ -e BUILD_NUMBER=${BUILD_NUMBER} \ -e BUILD_URL=${BUILD_URL} \ + -e http_proxy="${HTTP_PROXY}" \ + -e HTTP_PROXY="${HTTP_PROXY}" \ + -e https_proxy="${HTTPS_PROXY}" \ + -e HTTPS_PROXY="${HTTPS_PROXY}" \ + -e NO_PROXY="${NO_PROXY}" \ -v `pwd`:/var/project \ ${DOCKER_BUILDER_IMAGE_NAME} \ make test @@ -160,6 +170,11 @@ coverage-with-docker: prepare-docker-build-image ## Generates coverage report in -e CI_BUILD_URL=${BUILD_URL} \ -e CI_BRANCH=${GIT_BRANCH} \ -e CI_PULL_REQUEST=${CI_PULL_REQUEST} \ + -e http_proxy="${HTTP_PROXY}" \ + -e HTTP_PROXY="${HTTP_PROXY}" \ + -e https_proxy="${HTTPS_PROXY}" \ + -e HTTPS_PROXY="${HTTPS_PROXY}" \ + -e NO_PROXY="${NO_PROXY}" \ ${DOCKER_BUILDER_IMAGE_NAME} \ make coverage diff --git a/docker/Dockerfile-build b/docker/Dockerfile-build index 25b071293..1ee7f1a54 100644 --- a/docker/Dockerfile-build +++ b/docker/Dockerfile-build @@ -1,10 +1,13 @@ FROM python:3.4-slim +ARG APT_HTTP_PROXY + ENV PYTHONUNBUFFERED=1 \ DEBIAN_FRONTEND=noninteractive RUN \ echo "Install base packages" \ + && ([ -z "$APT_HTTP_PROXY" ] || echo "Acquire::http::Proxy \"${APT_HTTP_PROXY}\";\n" > /etc/apt/apt.conf.d/99HttpProxy) \ && apt-get update \ && apt-get install -y --no-install-recommends \ make \ diff --git a/docker/Makefile b/docker/Makefile index 9b3d7a010..c4e905d51 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -7,4 +7,4 @@ help: .PHONY: build-build-image build-build-image: - docker build --pull -f Dockerfile-build -t govuk/notify-api-builder . + docker build --pull -f Dockerfile-build -t govuk/notify-api-builder --build-arg APT_HTTP_PROXY="${HTTP_PROXY}" .