From: fonsecaj <jpedrofonseca@av.it.pt>
Date: Thu, 11 Feb 2021 13:08:52 +0000 (+0100)
Subject: Fixes Bug 1275 NBI Dockerfile Update
X-Git-Tag: branch-sol006v331-start~55
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=f404b8be8c1a89defe7888bac7059ae52e2c3d2a;p=osm%2Fdevops.git

Fixes Bug 1275 NBI Dockerfile Update

Author: João Fonseca <jpedrofonseca@av.it.pt>
Committer: João Fonseca <jpedrofonseca@av.it.pt>

Change-Id: Iae14ab5be983188af0616cfbf238362781aea6b1
Signed-off-by: João Fonseca <jpedrofonseca@av.it.pt>
---

diff --git a/docker/NBI/Dockerfile b/docker/NBI/Dockerfile
index ca965adf..af03e3b6 100644
--- a/docker/NBI/Dockerfile
+++ b/docker/NBI/Dockerfile
@@ -22,10 +22,20 @@ FROM ubuntu:18.04
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install curl software-properties-common
 
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y git python3 python3-jsonschema \
-    python3-pymongo python3-yaml python3-pip python3-keystoneclient \
-    && pip3 install -U pip \
-    && python3 -m pip install aiokafka dataclasses aiohttp cherrypy==18.1.2 pyangbind keystoneauth1 \
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y git python3 python3-dev python3-pip python3-yaml
+
+RUN python3 -m pip install --upgrade pip
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y rustc cargo
+
+RUN python3 --version && python3 -m pip --version
+
+RUN rustc --version && cargo --version
+
+RUN python3 -m pip install --upgrade setuptools setuptools-rust
+
+RUN python3 -m pip install --upgrade aiokafka dataclasses python-keystoneclient pymongo jsonschema \
+                                     aiohttp cherrypy==18.1.2 pyangbind keystoneauth1 \
     && mkdir -p /app/storage/kafka && mkdir -p /app/log
 
 ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
@@ -40,7 +50,7 @@ ARG NBI_VERSION
 ARG COMMON_VERSION
 ARG IM_VERSION
 
-RUN apt-get update && apt-get -y install python3-osm-nbi${NBI_VERSION} python3-osm-common${COMMON_VERSION} python3-osm-im${IM_VERSION}
+RUN apt-get update &&DEBIAN_FRONTEND=noninteractive apt-get -y install python3-osm-nbi${NBI_VERSION} python3-osm-common${COMMON_VERSION} python3-osm-im${IM_VERSION}
 
 # Set the working directory to /app
 WORKDIR /app/osm_nbi