X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=Dockerfile.local;h=33fbf454d584298bd3a9d4449358bb2ccdff54ce;hp=da13878c69f5a2850f4cdfc4188d7f047e5b9a1e;hb=55ba2e6f758ae650a2dbbc20638c0108df726809;hpb=4d34ece8ec2ca38738904ada9795a1654fd834d9;ds=sidebyside

diff --git a/Dockerfile.local b/Dockerfile.local
index da13878..33fbf45 100644
--- a/Dockerfile.local
+++ b/Dockerfile.local
@@ -1,3 +1,16 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # This creates osm/NBI docker from local NBI source code
 
 FROM ubuntu:16.04
@@ -5,9 +18,6 @@ FROM ubuntu:16.04
 # Set the working directory to /app
 WORKDIR /app/NBI/osm_nbi
 
-# Copy the current directory contents into the container at /app
-ADD . /app/NBI
-
 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 \
@@ -15,8 +25,8 @@ RUN apt-get update && apt-get install -y git python3 python3-jsonschema \
     && mkdir -p /app/storage/kafka && mkdir -p /app/log 
 
 # OSM_COMMON
-RUN git clone https://osm.etsi.org/gerrit/osm/common.git \
-    && pip3 install -e common
+RUN git -C /app clone https://osm.etsi.org/gerrit/osm/common.git \
+    && pip3 install -e /app/common
 #    && cd common  && python3 setup.py develop && cd ..
 #    && pip3 install -U -r requirements.txt \
 #    && cd ..
@@ -30,6 +40,7 @@ RUN pip3 install pyang && mkdir -p /app && cd /app \
     && 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 \
+    && pyang --plugindir /app/pyangbind/pyangbind/plugin -f pybind -o /app/IM/osm_im/nst.py nst.yang \
     && pip3 install -e /app/IM
 
 EXPOSE 9999
@@ -56,19 +67,16 @@ 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
+# ENV OSMNBI_DATABASE_COMMONKEY                 xxx
 # web
-ENV OSMNBI_STATIC_DIR                           /app/osm_nbi/html_public
+ENV OSMNBI_STATIC_DIR                           /app/NBI/osm_nbi/html_public
 # logs
-ENV OSMNBI_LOG_FILE                             /app/log
+# ENV OSMNBI_LOG_FILE                             /app/log/nbi.log
 ENV OSMNBI_LOG_LEVEL                            DEBUG
 # message
 ENV OSMNBI_MESSAGE_DRIVER                       kafka
 ENV OSMNBI_MESSAGE_HOST                         kafka
 ENV OSMNBI_MESSAGE_PORT                         9092
-# logs
-ENV OSMNBI_LOG_FILE                             /app/log/nbi.log
-ENV OSMNBI_LOG_LEVEL                            DEBUG
 # authentication
 ENV OSMNBI_AUTHENTICATION_BACKEND               internal
 #ENV OSMNBI_AUTHENTICATION_BACKEND               keystone
@@ -80,6 +88,8 @@ ENV OSMNBI_AUTHENTICATION_BACKEND               internal
 #ENV OSMNBI_AUTHENTICATION_SERVICE_PASSWORD      nbi
 #ENV OSMNBI_AUTHENTICATION_SERVICE_PROJECT       service
 
+# Copy the current directory contents into the container at /app
+ADD . /app/NBI
+
 # Run app.py when the container launches
 CMD ["python3", "nbi.py"]
-