commit e7646259a1e3047d089fc9b8ca023475288ce533
author beierlm <mark.beierl@canonical.com> Thu Jan 13 10:53:08 2022 -0500
committer beierlm <mark.beierl@canonical.com> Fri Jan 14 15:43:21 2022 +0100
tree 5f33c334ef7965301e0e9bfddcaa18712788c2c2
parent c1ae239c3440000ce6d9ec47386e13d67c13e815

Bug 1858: Adding APT proxy

Adds apt proxy to build scripts and dockerfiles.  Backward compatible
change and proxy will not be used unless environment variable
is supplied to docker build command.

Fixes bug 1858

Change-Id: Ibd25bd1c145b8d43eeb85c5c952aec30ebcce1fc
Signed-off-by: beierlm <mark.beierl@canonical.com>

docker/osmclient/Dockerfile

diff --git a/docker/osmclient/Dockerfile b/docker/osmclient/Dockerfile
index 299990a..49b01f3 100644
--- a/docker/osmclient/Dockerfile
+++ b/docker/osmclient/Dockerfile
@@ -17,6 +17,12 @@
 
 FROM ubuntu:18.04 as INSTALL
 
+ARG APT_PROXY
+RUN if [ ! -z $APT_PROXY ] ; then \
+    echo "Acquire::http::Proxy \"$APT_PROXY\";" > /etc/apt/apt.conf.d/proxy.conf ;\
+    echo "Acquire::https::Proxy \"$APT_PROXY\";" >> /etc/apt/apt.conf.d/proxy.conf ;\
+    fi
+
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     DEBIAN_FRONTEND=noninteractive apt-get --yes install \
     gcc=4:7.4.* \