Bug 2139: OSM OCI images have 172.21.1.1 as apt proxy

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

diff --git a/docker/osmclient/Dockerfile b/docker/osmclient/Dockerfile
index f5980ad..ae4a1ab 100644 (file)
--- a/docker/osmclient/Dockerfile
+++ b/docker/osmclient/Dockerfile
@@ -15,20 +15,27 @@
 # limitations under the License.
 #######################################################################################
 
-FROM ubuntu:18.04 as INSTALL
+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
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     DEBIAN_FRONTEND=noninteractive apt-get --yes install \
-    gcc=4:7.4.0-1ubuntu2.3 \
-    python3=3.6.7-1~18.04 \
-    python3-dev=3.6.7-1~18.04 \
-    python3-setuptools=39.0.1-2 \
-    curl=7.58.0-2ubuntu3.13 && \
-    python3 -m easy_install pip==21.0.1
+    gcc=4:9.3.* \
+    python3=3.8.* \
+    python3-dev=3.8.* \
+    python3-pip=20.0.2* \
+    python3-setuptools=45.2.* \
+    curl=7.68.*
 
-RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \
-    libcurl4-openssl-dev=7.58.0-2ubuntu3.13 \
-    libssl-dev=1.1.1-1ubuntu2.1~18.04.9
+RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
+    DEBIAN_FRONTEND=noninteractive apt-get --yes install \
+    libcurl4-openssl-dev=7.68.* \
+    libssl-dev=1.1.*
 
 ARG PYTHON3_OSMCLIENT_URL
 ARG PYTHON3_OSM_IM_URL
@@ -43,13 +50,24 @@ RUN pip3 install \
     -r /usr/lib/python3/dist-packages/osmclient/requirements.txt \
     -r /usr/lib/python3/dist-packages/osm_im/requirements.txt
 
-FROM ubuntu:18.04 as FINAL
+#######################################################################################
+FROM ubuntu:20.04 as FINAL
+
+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 python3-minimal=3.6.7-1~18.04
+    DEBIAN_FRONTEND=noninteractive apt-get --yes install \
+    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.6/dist-packages  /usr/local/lib/python3.6/dist-packages
+COPY --from=INSTALL /usr/local/lib/python3.8/dist-packages  /usr/local/lib/python3.8/dist-packages
 
 ENV OSM_SOL005=True
 ENV OSM_HOSTNAME=nbi:9999