X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FRO%2FDockerfile;h=cf6d7146acdad0edb058b85ec7f63c8a475f39d8;hb=318551148eb32854ea4959e340eaba56f1f2de5f;hp=85c72020ebf98a5c1cdce504f2400c5dc68244cd;hpb=3f94843d26c7dce9a75a64de70a4c4fb6802c3dd;p=osm%2Fdevops.git

diff --git a/docker/RO/Dockerfile b/docker/RO/Dockerfile
index 85c72020..cf6d7146 100644
--- a/docker/RO/Dockerfile
+++ b/docker/RO/Dockerfile
@@ -16,18 +16,21 @@
 
 ########################################################################
 
-FROM ubuntu:18.04 as INSTALL
+FROM ubuntu:20.04 as INSTALL
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
+    DEBIAN_FRONTEND=noninteractive apt-get --yes install \
+    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 update && \
     DEBIAN_FRONTEND=noninteractive apt-get --yes install \
-    gcc=4:7.4.* \
-    python3=3.6.* \
-    python3-dev=3.6.* \
-    python3-setuptools=39.0.* \
-    curl=7.58.* \
     genisoimage=9:1.1.* \
-    netbase=5.* && \
-    python3 -m easy_install pip==21.0.1 setuptools==51.0.0
+    netbase=6.*
 
 ARG PYTHON3_OSM_COMMON_URL
 ARG PYTHON3_OSM_NG_RO_URL
@@ -43,8 +46,6 @@ ARG PYTHON3_OSM_ROSDN_ONOSOF_URL
 ARG PYTHON3_OSM_ROSDN_ONOS_VPLS_URL
 ARG PYTHON3_OSM_ROVIM_AWS_URL
 ARG PYTHON3_OSM_ROVIM_AZURE_URL
-ARG PYTHON3_OSM_ROVIM_FOS_URL
-# ARG PYTHON3_OSM_ROVIM_OPENNEBULA_URL
 ARG PYTHON3_OSM_ROVIM_OPENSTACK_URL
 ARG PYTHON3_OSM_ROVIM_OPENVIM_URL
 ARG PYTHON3_OSM_ROVIM_VMWARE_URL
@@ -64,8 +65,6 @@ RUN for URL in \
     $PYTHON3_OSM_ROSDN_ONOS_VPLS_URL \
     $PYTHON3_OSM_ROVIM_AWS_URL \
     $PYTHON3_OSM_ROVIM_AZURE_URL \
-    $PYTHON3_OSM_ROVIM_FOS_URL \
-    # $PYTHON3_OSM_ROVIM_OPENNEBULA_URL \
     $PYTHON3_OSM_ROVIM_OPENSTACK_URL \
     $PYTHON3_OSM_ROVIM_OPENVIM_URL \
     $PYTHON3_OSM_ROVIM_VMWARE_URL ; do \
@@ -78,14 +77,22 @@ RUN pip3 install \
     -r /usr/lib/python3/dist-packages/osm_common/requirements.txt \
     -r /usr/lib/python3/dist-packages/osm_ng_ro/requirements.txt
 
-FROM ubuntu:18.04
+#######################################################################################
+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.* \
+    DEBIAN_FRONTEND=noninteractive apt-get --yes install \
+    python3-minimal=3.8.* \
     && rm -rf /var/lib/apt/lists/*
 
 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
 COPY --from=INSTALL /usr/bin/genisoimage /usr/bin/genisoimage
 COPY --from=INSTALL /etc/protocols /etc/protocols