fixing package dependencies and generation

[osm/NBI.git] / Dockerfile.local

diff --git a/Dockerfile.local b/Dockerfile.local
index da13878..c76bc27 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
 
 # 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 \
 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
     && 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 ..
 #    && cd common  && python3 setup.py develop && cd ..
 #    && pip3 install -U -r requirements.txt \
 #    && cd ..


@@ -56,19 +53,16 @@ ENV OSMNBI_DATABASE_HOST                        mongo
 ENV OSMNBI_DATABASE_PORT                        27017
 # ENV OSMNBI_DATABASE_USER                      xxx
 # ENV OSMNBI_DATABASE_PASSWORD                  xxx
 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
 # web

-ENV OSMNBI_STATIC_DIR                           /app/osm_nbi/html_public
+ENV OSMNBI_STATIC_DIR                           /app/NBI/osm_nbi/html_public

 # logs
 # 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
 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
 # authentication
 ENV OSMNBI_AUTHENTICATION_BACKEND               internal
 #ENV OSMNBI_AUTHENTICATION_BACKEND               keystone


@@ -80,6 +74,8 @@ ENV OSMNBI_AUTHENTICATION_BACKEND               internal
 #ENV OSMNBI_AUTHENTICATION_SERVICE_PASSWORD      nbi
 #ENV OSMNBI_AUTHENTICATION_SERVICE_PROJECT       service
 
 #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"]
 # Run app.py when the container launches
 CMD ["python3", "nbi.py"]

-