From: calvinosanch <guillermo.calvinosanchez@altran.com>
Date: Thu, 9 Jan 2020 15:10:12 +0000 (+0100)
Subject: Ubuntu18 + pip upgraded
X-Git-Tag: v7.0.1rc1~2
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F72%2F8472%2F3;p=osm%2FNBI.git

Ubuntu18 + pip upgraded

Change-Id: Ia2b7c42455271883daa885491e77319a854ea9ce
Signed-off-by: calvinosanch <guillermo.calvinosanchez@altran.com>
---

diff --git a/Dockerfile.local b/Dockerfile.local
index b96d918..4d62b62 100644
--- a/Dockerfile.local
+++ b/Dockerfile.local
@@ -13,37 +13,29 @@
 
 # This creates osm/NBI docker from local NBI source code
 
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 # Set the working directory to /app
 WORKDIR /app/NBI
 
+RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
+
 RUN apt-get update && apt-get install -y git python3 python3-jsonschema \
     python3-pymongo python3-yaml python3-pip python3-keystoneclient \
-    && pip3 install pip==9.0.3 \
-    && pip3 install aiokafka aiohttp cherrypy==18.1.2 keystoneauth1 requests \
+    && python3 -m pip install pip --upgrade \
+    && python3 -m pip install aiokafka aiohttp cherrypy==18.1.2 keystoneauth1 requests \
     && mkdir -p /app/storage/kafka && mkdir -p /app/log 
 
 # OSM_COMMON
 RUN git -C /app clone https://osm.etsi.org/gerrit/osm/common.git \
-    && pip3 install -e /app/common
+    && python3 -m pip install -e /app/common
 #    && cd common  && python3 setup.py develop && cd ..
 #    && pip3 install -U -r requirements.txt \
 #    && cd ..
 
 # OSM_IM
-RUN pip3 install pyang && mkdir -p /app && cd /app \
-    && git -C /app clone https://github.com/robshakir/pyangbind \
-    && pip3 install -e /app/pyangbind \
-    && git -C /app clone  https://osm.etsi.org/gerrit/osm/IM \
-    && mkdir -p /app/IM/osm_im \
-    && pyang --plugindir /app/pyangbind/pyangbind/plugin -f pybind -p /app/IM/models/yang \
-       -o /app/IM/osm_im/vnfd.py /app/IM/models/yang/vnfd.yang \
-    && pyang --plugindir /app/pyangbind/pyangbind/plugin -f pybind -p /app/IM/models/yang \
-       -o /app/IM/osm_im/nsd.py /app/IM/models/yang/nsd.yang \
-    && pyang --plugindir /app/pyangbind/pyangbind/plugin -f pybind -p /app/IM/models/yang \
-       -o /app/IM/osm_im/nst.py /app/IM/models/yang/nst.yang \
-    && pip3 install -e /app/IM
+RUN git -C /app clone  https://osm.etsi.org/gerrit/osm/IM \
+    && python3 -m pip install /app/IM
 
 EXPOSE 9999
 
diff --git a/debian/python3-osm-nbi.postinst b/debian/python3-osm-nbi.postinst
index 769c250..c2400c6 100755
--- a/debian/python3-osm-nbi.postinst
+++ b/debian/python3-osm-nbi.postinst
@@ -20,9 +20,9 @@
 echo "POST INSTALL OSM-NBI"
 echo "Installing python dependencies via pip..."
 
-pip3 install pip==9.0.3
-pip3 install cherrypy==18.1.2
-pip3 install keystoneauth1
+python3 -m pip install -U pip
+python3 -m pip install cherrypy==18.1.2
+python3 -m pip install keystoneauth1
 
 #Creation of log folder
 mkdir -p /var/log/osm