From 88353232aab689728a63690ed5876b1614ffd22f Mon Sep 17 00:00:00 2001 From: Phil Sphicas Date: Wed, 10 Jun 2020 03:01:20 +0000 Subject: [PATCH] Respect USE_PROXY=true for image builds When using 'make USE_PROXY=true', the 'docker build' is executed with the correct proxy-related build-args, but the Dockerfile does not actually consume them. This change updates the Dockerfiles to accept the following ARGs: HTTP_PROXY, HTTPS_PROXY, NO_PROXY (upper or lowercase) Change-Id: I6888d1f15f430e73338c269784ded9a0dea6c9ce --- images/maas-rack-controller/Dockerfile | 7 +++++++ images/maas-region-controller/Dockerfile | 7 +++++++ images/sstream-cache/Dockerfile | 7 +++++++ 3 files changed, 21 insertions(+) diff --git a/images/maas-rack-controller/Dockerfile b/images/maas-rack-controller/Dockerfile index 35b644c..2870066 100644 --- a/images/maas-rack-controller/Dockerfile +++ b/images/maas-rack-controller/Dockerfile @@ -8,6 +8,13 @@ LABEL org.opencontainers.image.source='https://git.openstack.org/openstack/airsh LABEL org.opencontainers.image.vendor='The Airship Authors' LABEL org.opencontainers.image.licenses='Apache-2.0' +ARG HTTP_PROXY +ARG HTTPS_PROXY +ARG NO_PROXY +ARG http_proxy +ARG https_proxy +ARG no_proxy + ENV DEBIAN_FRONTEND noninteractive ENV container docker diff --git a/images/maas-region-controller/Dockerfile b/images/maas-region-controller/Dockerfile index cdc2811..29be3a9 100644 --- a/images/maas-region-controller/Dockerfile +++ b/images/maas-region-controller/Dockerfile @@ -8,6 +8,13 @@ LABEL org.opencontainers.image.source='https://git.openstack.org/openstack/airsh LABEL org.opencontainers.image.vendor='The Airship Authors' LABEL org.opencontainers.image.licenses='Apache-2.0' +ARG HTTP_PROXY +ARG HTTPS_PROXY +ARG NO_PROXY +ARG http_proxy +ARG https_proxy +ARG no_proxy + ENV DEBIAN_FRONTEND noninteractive ENV container docker diff --git a/images/sstream-cache/Dockerfile b/images/sstream-cache/Dockerfile index d840a33..9e5ca1f 100644 --- a/images/sstream-cache/Dockerfile +++ b/images/sstream-cache/Dockerfile @@ -8,6 +8,13 @@ LABEL org.opencontainers.image.source='https://git.openstack.org/openstack/airsh LABEL org.opencontainers.image.vendor='The Airship Authors' LABEL org.opencontainers.image.licenses='Apache-2.0' +ARG HTTP_PROXY +ARG HTTPS_PROXY +ARG NO_PROXY +ARG http_proxy +ARG https_proxy +ARG no_proxy + ARG SSTREAM_IMAGE=https://images.maas.io/ephemeral-v3/daily/ ARG SSTREAM_RELEASE=xenial