X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=inline;f=docker%2FRO%2FDockerfile;h=09281befed9dbaff4eee576ac3b2098d48dc028b;hb=da0e40f9a97f7517c1f4a49d6759f4063078f525;hp=4783c01a04b3541f3daff54f0fa01daa34d7b7fc;hpb=9ec1fe9dfe6f169025f11d994af2912e98b41f15;p=osm%2Fdevops.git

diff --git a/docker/RO/Dockerfile b/docker/RO/Dockerfile
index 4783c01a..09281bef 100644
--- a/docker/RO/Dockerfile
+++ b/docker/RO/Dockerfile
@@ -24,7 +24,7 @@ RUN apt-get update && apt-get -y install curl software-properties-common git tox
     && python3 -m pip install --upgrade pip && python3 -m pip install pyangbind networking-l2gw
 
 ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
-ARG RELEASE=ReleaseEIGHT-daily
+ARG RELEASE=ReleaseNINE-daily
 ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg
 ARG REPOSITORY=testing
 
@@ -32,11 +32,10 @@ RUN curl ${REPOSITORY_BASE}/${RELEASE}/${REPOSITORY_KEY} | apt-key add -
 RUN add-apt-repository -y "deb ${REPOSITORY_BASE}/${RELEASE} ${REPOSITORY} RO IM common" && apt-get update
 
 ARG RO_VERSION
-ARG IM_VERSION
+ARG COMMON_VERSION
 
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y python3-osm-im${IM_VERSION} \
-    python3-osm-ro-plugin${RO_VERSION} \
-    python3-osm-ro${RO_VERSION} python3-osm-roclient${RO_VERSION} python3-osm-ng-ro${RO_VERSION} \
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y python3-osm-common${COMMON_VERSION} \
+    python3-osm-ro-plugin${RO_VERSION} python3-osm-ng-ro${RO_VERSION} \
     python3-osm-rosdn-arista-cloudvision${RO_VERSION} python3-osm-rosdn-dpb${RO_VERSION} \
     python3-osm-rosdn-dynpac${RO_VERSION} python3-osm-rosdn-floodlightof${RO_VERSION} \
     python3-osm-rosdn-ietfl2vpn${RO_VERSION}  python3-osm-rosdn-juniper-contrail${RO_VERSION} \
@@ -47,7 +46,12 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y python3-
     python3-osm-rovim-openstack${RO_VERSION} python3-osm-rovim-openvim${RO_VERSION} \
     python3-osm-rovim-vmware${RO_VERSION}
 
-# ensure right version is installed as pyhton3-ccryptography install an old version
+# ensure right version is installed as python3-cryptography install an old version
+# Since release 3.4 of python3-cryptography rust is an dependency
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential libssl-dev libffi-dev \
+    python3-dev cargo
+
 RUN python3 -m pip install --upgrade "cryptography>=2.5"
 
 VOLUME /var/log/osm
@@ -95,5 +99,5 @@ HEALTHCHECK --start-period=130s --interval=10s --timeout=5s --retries=12 \
   CMD curl --silent --fail http://localhost:9090/ro || exit 1
   # CMD curl --silent --fail localhost:9090/openmano/tenants || exit 1
 # CMD /usr/bin/RO-start.sh
-CMD python3 -m osm_ng_ro.ro_main
+CMD ["python3", "-u", "-m", "osm_ng_ro.ro_main"]