X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FRO%2FDockerfile;h=4e7d548889cc74e07dd079ff43921eb9baa9cef5;hb=847febf8619c2d3a3a66afef14fe794fdf02d8d5;hp=ec88edcb3d3e80dd549bc274102dfad89f515114;hpb=e4b0c4153709d35221796e0301b4f6b68ae953da;p=osm%2Fdevops.git diff --git a/docker/RO/Dockerfile b/docker/RO/Dockerfile index ec88edcb..4e7d5488 100644 --- a/docker/RO/Dockerfile +++ b/docker/RO/Dockerfile @@ -20,15 +20,14 @@ FROM ubuntu:18.04 as INSTALL 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 - -RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \ - genisoimage=9:1.1.11-3ubuntu2 netbase=5.4 + 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 ARG PYTHON3_OSM_COMMON_URL ARG PYTHON3_OSM_NG_RO_URL @@ -44,6 +43,7 @@ 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_OPENSTACK_URL @@ -65,6 +65,7 @@ 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_OPENSTACK_URL \ @@ -82,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.7-1~18.04 + 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