X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=Dockerfile.local;h=4d62b62c7cb545e42ecd59e5556e83a16cb86721;hp=8635e4bed697dc1a9d8383e710f5b66a9cb2f5b8;hb=a8186a5a72a86aba974651abcf7e08ec454fe53d;hpb=1bfe4e2392fe3ba155d71ad4f99fbc7fd21e68be

diff --git a/Dockerfile.local b/Dockerfile.local
index 8635e4b..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 /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
 
@@ -64,7 +56,11 @@ ENV OSMNBI_SOCKET_PORT                          9999
 ENV OSMNBI_SERVER_SSL_CERTIFICATE               /app/NBI/osm_nbi/http/cert.pem
 ENV OSMNBI_SERVER_SSL_PRIVATE_KEY               /app/NBI/osm_nbi/http/privkey.pem
 # storage
+ENV OSMNBI_STORAGE_DRIVER                       local
 ENV OSMNBI_STORAGE_PATH                         /app/storage
+#ENV OSMNBI_STORAGE_DRIVER                       mongo
+#ENV OSMNBI_STORAGE_URI                          mongodb://mongo:27017
+#ENV OSMNBI_STORAGE_COLLECTION                   files
 # database
 ENV OSMNBI_DATABASE_DRIVER                      mongo
 ENV OSMNBI_DATABASE_HOST                        mongo