commit e5b9ba619c48d8768a3e75ed35883c034c38e107
author Mark Beierl <mark.beierl@canonical.com> Thu Sep 08 05:44:06 2022 -0400
committer beierlm <mark.beierl@canonical.com> Thu Sep 08 18:05:43 2022 +0200
tree b3023dbc6418fc64e4568d69ad5e92f69c30364c
parent dbc2c0ebc0491d1df2c175384ab399ab19451a40

Bug 2139: OSM OCI images have 172.21.1.1 as apt proxy

Removes the apt proxy configuration from the final
image layers

Change-Id: I3f2dfd81a04b42d3ee570cdc71ca41da39e621d0
Signed-off-by: Mark Beierl <mark.beierl@canonical.com>

docker/osmclient/Dockerfile

diff --git a/docker/osmclient/Dockerfile b/docker/osmclient/Dockerfile
index 088cd4d..ae4a1ab 100644
--- a/docker/osmclient/Dockerfile
+++ b/docker/osmclient/Dockerfile
@@ -23,12 +23,6 @@
     echo "Acquire::https::Proxy \"$APT_PROXY\";" >> /etc/apt/apt.conf.d/proxy.conf ;\
     fi
 
-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:9.3.* \
@@ -41,7 +35,7 @@
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     DEBIAN_FRONTEND=noninteractive apt-get --yes install \
     libcurl4-openssl-dev=7.68.* \
-    libssl-dev=1.1.* 
+    libssl-dev=1.1.*
 
 ARG PYTHON3_OSMCLIENT_URL
 ARG PYTHON3_OSM_IM_URL
@@ -70,6 +64,8 @@
     python3-minimal=3.8.* \
     && rm -rf /var/lib/apt/lists/*
 
+RUN rm -f /etc/apt/apt.conf.d/proxy.conf
+
 COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages
 COPY --from=INSTALL /usr/local/lib/python3.8/dist-packages  /usr/local/lib/python3.8/dist-packages