airship
/
maas
Code Issues Proposed changes

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
This commit is contained in:
Phil Sphicas 2020-06-10 03:01:20 +00:00
parent 2989bbb4a2
commit 88353232aa
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
images/maas-rack-controller/Dockerfile
View File

@ -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

7
images/maas-region-controller/Dockerfile
View File

@ -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

7
images/sstream-cache/Dockerfile
View File

@ -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