Fix bug 1809 - Disabling RO OpenNebula plugin

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

diff --git a/docker/RO/Dockerfile b/docker/RO/Dockerfile
index 8dbba7e..1414bf9 100644 (file)
--- a/docker/RO/Dockerfile
+++ b/docker/RO/Dockerfile
@@ -27,7 +27,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     curl=7.58.* \
     genisoimage=9:1.1.* \
     netbase=5.* && \
-    python3 -m easy_install pip==21.0.1
+    python3 -m easy_install pip==21.0.1 setuptools==51.0.0
 
 ARG PYTHON3_OSM_COMMON_URL
 ARG PYTHON3_OSM_NG_RO_URL
@@ -43,8 +43,9 @@ 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_GCP_URL
 ARG PYTHON3_OSM_ROVIM_FOS_URL
-ARG PYTHON3_OSM_ROVIM_OPENNEBULA_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,9 @@ RUN for URL in \
     $PYTHON3_OSM_ROSDN_ONOS_VPLS_URL \
     $PYTHON3_OSM_ROVIM_AWS_URL \
     $PYTHON3_OSM_ROVIM_AZURE_URL \
+    $PYTHON3_OSM_ROVIM_GCP_URL \
     $PYTHON3_OSM_ROVIM_FOS_URL \
-    $PYTHON3_OSM_ROVIM_OPENNEBULA_URL \
+    # $PYTHON3_OSM_ROVIM_OPENNEBULA_URL \
     $PYTHON3_OSM_ROVIM_OPENSTACK_URL \
     $PYTHON3_OSM_ROVIM_OPENVIM_URL \
     $PYTHON3_OSM_ROVIM_VMWARE_URL ; do \
@@ -81,7 +83,8 @@ RUN pip3 install \
 FROM ubuntu:18.04
 
 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.6.* \
+    && 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