fixing dockerfile.local

Change-Id: Ieb8340d6d3baa888340610321eebc220b1f11c5b
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>

diff --git a/Dockerfile.local b/Dockerfile.local
index 372e6a9..56dbd82 100644 (file)
--- a/Dockerfile.local
+++ b/Dockerfile.local
@@ -5,9 +5,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
-
 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 +12,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 ..
@@ -58,17 +55,14 @@ ENV OSMNBI_DATABASE_PORT                        27017
 # ENV OSMNBI_DATABASE_PASSWORD                  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
 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,8 +74,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"]
-

diff --git a/osm_nbi/nbi.cfg b/osm_nbi/nbi.cfg
index 1dbc9ca..5d5a22f 100644 (file)
--- a/osm_nbi/nbi.cfg
+++ b/osm_nbi/nbi.cfg
@@ -15,7 +15,7 @@ tools.response_headers.on = True
 
 [/static]
 tools.staticdir.on: True
-tools.staticdir.dir: "/app/osm_nbi/html_public"
+tools.staticdir.dir: "/app/NBI/osm_nbi/html_public"
 
 
 [global]