X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2Fosmclient%2FDockerfile;h=ae4a1ab9934524cfea03bd370f9ae6f7d9220298;hb=a43f09f36a703631bd69b37011b5e08f4d7a961e;hp=c7c48169344b036da2a179bf1b37be17f1a18c2c;hpb=d7449362766262e09ec63ada999e03ded530f907;p=osm%2Fdevops.git

diff --git a/docker/osmclient/Dockerfile b/docker/osmclient/Dockerfile
index c7c48169..ae4a1ab9 100644
--- 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 ;\
@@ -38,9 +32,10 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     python3-setuptools=45.2.* \
     curl=7.68.*
 
-RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \
+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
@@ -69,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