diff --git a/docker/Dockerfile-build b/docker/Dockerfile-build index e22b9f321..4c665c157 100644 --- a/docker/Dockerfile-build +++ b/docker/Dockerfile-build @@ -1,6 +1,8 @@ FROM python:3.4-slim -ARG APT_HTTP_PROXY +ARG HTTP_PROXY +ARG HTTPS_PROXY +ARG NO_PROXY ENV PYTHONUNBUFFERED=1 \ DEBIAN_FRONTEND=noninteractive \ @@ -8,7 +10,7 @@ ENV PYTHONUNBUFFERED=1 \ RUN \ echo "Install base packages" \ - && ([ -z "$APT_HTTP_PROXY" ] || echo "Acquire::http::Proxy \"${APT_HTTP_PROXY}\";\n" > /etc/apt/apt.conf.d/99HttpProxy) \ + && ([ -z "$HTTP_PROXY" ] || echo "Acquire::http::Proxy \"${HTTP_PROXY}\";\n" > /etc/apt/apt.conf.d/99HttpProxy) \ && apt-get update \ && apt-get install -y --no-install-recommends \ apt-transport-https \ diff --git a/docker/Makefile b/docker/Makefile index 23f3c32ce..49a3111ac 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -7,4 +7,11 @@ help: .PHONY: build-build-image build-build-image: - docker build --pull -f Dockerfile-build -t govuk/notify-admin-builder --build-arg APT_HTTP_PROXY="${HTTP_PROXY}" . + docker build \ + --pull \ + --build-arg HTTP_PROXY="${HTTP_PROXY}" \ + --build-arg HTTPS_PROXY="${HTTP_PROXY}" \ + --build-arg NO_PROXY="${NO_PROXY}" \ + -f Dockerfile-build \ + -t govuk/notify-admin-builder \ + .