X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=Dockerfile.local;h=da13878c69f5a2850f4cdfc4188d7f047e5b9a1e;hp=ba0bf5aaa09f9fdece9c65decec047d82e9e8c14;hb=42fce59a553debba41506932e1c42d0578324656;hpb=819d34c8315de5c2010743f499f7882b8957dcbf

diff --git a/Dockerfile.local b/Dockerfile.local
index ba0bf5a..da13878 100644
--- a/Dockerfile.local
+++ b/Dockerfile.local
@@ -3,10 +3,10 @@
 FROM ubuntu:16.04
 
 # Set the working directory to /app
-WORKDIR /app/osm_nbi
+WORKDIR /app/NBI/osm_nbi
 
 # Copy the current directory contents into the container at /app
-ADD . /app
+ADD . /app/NBI
 
 RUN apt-get update && apt-get install -y git python3 python3-jsonschema \
     python3-pymongo python3-yaml python3-pip python3-keystoneclient \
@@ -16,18 +16,21 @@ RUN apt-get update && apt-get install -y git python3 python3-jsonschema \
 
 # OSM_COMMON
 RUN git clone https://osm.etsi.org/gerrit/osm/common.git \
-    && cd common  && python3 setup.py develop && cd ..
+    && pip3 install -e 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 clone https://github.com/robshakir/pyangbind \
-    && pip3 install -e pyangbind \
-    && git clone  https://osm.etsi.org/gerrit/osm/IM \
+    && 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 \
     && cd /app/IM/models/yang \
-    && pyang --plugindir /app/pyangbind/pyangbind/plugin -f pybind -o /app/osm_nbi/vnfd_catalog.py vnfd.yang \
-    && pyang --plugindir /app/pyangbind/pyangbind/plugin -f pybind -o /app/osm_nbi/nsd_catalog.py nsd.yang
+    && mkdir /app/IM/osm_im \
+    && pyang --plugindir /app/pyangbind/pyangbind/plugin -f pybind -o /app/IM/osm_im/vnfd.py vnfd.yang \
+    && pyang --plugindir /app/pyangbind/pyangbind/plugin -f pybind -o /app/IM/osm_im/nsd.py nsd.yang \
+    && pip3 install -e /app/IM
 
 EXPOSE 9999
 
@@ -51,6 +54,9 @@ ENV OSMNBI_STORAGE_PATH                         /app/storage
 ENV OSMNBI_DATABASE_DRIVER                      mongo
 ENV OSMNBI_DATABASE_HOST                        mongo
 ENV OSMNBI_DATABASE_PORT                        27017
+# ENV OSMNBI_DATABASE_USER                      xxx
+# ENV OSMNBI_DATABASE_PASSWORD                  xxx
+# ENV OSMNBI_DATABASE_MASTERPASSWORD            xxx
 # web
 ENV OSMNBI_STATIC_DIR                           /app/osm_nbi/html_public
 # logs