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>

diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile
index f662d7b..48fcede 100644 (file)
--- a/docker/LCM/Dockerfile
+++ b/docker/LCM/Dockerfile
@@ -91,6 +91,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     ca-certificates \
     && 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
 

diff --git a/docker/MON/Dockerfile b/docker/MON/Dockerfile
index f140933..cd56f53 100644 (file)
--- a/docker/MON/Dockerfile
+++ b/docker/MON/Dockerfile
@@ -73,6 +73,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     ca-certificates \
     && 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
 COPY --from=INSTALL /usr/bin/osm* /usr/bin/

diff --git a/docker/NBI/Dockerfile b/docker/NBI/Dockerfile
index e43a037..8957479 100644 (file)
--- a/docker/NBI/Dockerfile
+++ b/docker/NBI/Dockerfile
@@ -64,6 +64,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     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
 

diff --git a/docker/NG-UI/Dockerfile b/docker/NG-UI/Dockerfile
index c4d67df..74aa1d4 100644 (file)
--- a/docker/NG-UI/Dockerfile
+++ b/docker/NG-UI/Dockerfile
@@ -62,6 +62,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     nginx=1.18.* && \
     rm -rf /var/lib/apt/lists/*
 
+RUN rm -f /etc/apt/apt.conf.d/proxy.conf
+
 # Removing the Nginx default page.
 RUN rm -rf /usr/share/nginx/html/*
 

diff --git a/docker/PLA/Dockerfile b/docker/PLA/Dockerfile
index 282a832..f637362 100644 (file)
--- a/docker/PLA/Dockerfile
+++ b/docker/PLA/Dockerfile
@@ -17,18 +17,6 @@
 
 FROM ubuntu:20.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
-
-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
-
 ARG APT_PROXY
 RUN if [ ! -z $APT_PROXY ] ; then \
     echo "Acquire::http::Proxy \"$APT_PROXY\";" > /etc/apt/apt.conf.d/proxy.conf ;\
@@ -76,6 +64,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     python3-minimal=3.8.* \
     && rm -rf /var/lib/apt/lists/*
 
+RUN rm -f /etc/apt/apt.conf.d/proxy.conf
+
 LABEL authors="Lars-Göran Magnusson"
 
 COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages
@@ -102,7 +92,7 @@ RUN groupadd -g 1000 appuser && \
 WORKDIR /app/osm_pla
 
 # Changing the security context
-USER appuser 
+USER appuser
 
 ENV OSMPLA_MESSAGE_DRIVER kafka
 ENV OSMPLA_MESSAGE_HOST kafka

diff --git a/docker/POL/Dockerfile b/docker/POL/Dockerfile
index db584b8..b807bfd 100644 (file)
--- a/docker/POL/Dockerfile
+++ b/docker/POL/Dockerfile
@@ -63,6 +63,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     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
 COPY --from=INSTALL /usr/bin/osm* /usr/bin/

diff --git a/docker/RO/Dockerfile b/docker/RO/Dockerfile
index 0a98dee..64bad45 100644 (file)
--- a/docker/RO/Dockerfile
+++ b/docker/RO/Dockerfile
@@ -98,6 +98,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     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
 COPY --from=INSTALL /usr/bin/genisoimage /usr/bin/genisoimage

diff --git a/docker/osmclient/Dockerfile b/docker/osmclient/Dockerfile
index 088cd4d..ae4a1ab 100644 (file)
--- a/docker/osmclient/Dockerfile
+++ b/docker/osmclient/Dockerfile
@@ -17,12 +17,6 @@
 
 FROM ubuntu:20.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
-
 ARG APT_PROXY
 RUN if [ ! -z $APT_PROXY ] ; then \
     echo "Acquire::http::Proxy \"$APT_PROXY\";" > /etc/apt/apt.conf.d/proxy.conf ;\
@@ -41,7 +35,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
 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 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     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