Bug 2139: OSM OCI images have 172.21.1.1 as apt proxy

[osm/devops.git] / docker / PLA / Dockerfile

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