X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=Dockerfile.local;h=2f345615b557c29a5e01c07f819aa5ac83e30fa7;hp=def89c4925fd0a2da17a00ff76c0cbed07aa43db;hb=6b02b05e51fb2837731027ae063ecbdb2c71135d;hpb=7b7ffa61e6282094c1bd528e60b3b395c3ab1358

diff --git a/Dockerfile.local b/Dockerfile.local
index def89c4..2f34561 100644
--- a/Dockerfile.local
+++ b/Dockerfile.local
@@ -13,35 +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/osm_nbi
+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 cherrypy==18.0.0 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 \
-    && cd /app/IM/models/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 \
-    && pyang --plugindir /app/pyangbind/pyangbind/plugin -f pybind -o /app/IM/osm_im/nst.py 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
 
@@ -59,8 +53,14 @@ VOLUME /app/log
 # server
 ENV OSMNBI_SOCKET_HOST                          0.0.0.0
 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
@@ -73,6 +73,8 @@ ENV OSMNBI_STATIC_DIR                           /app/NBI/osm_nbi/html_public
 # logs
 # ENV OSMNBI_LOG_FILE                             /app/log/nbi.log
 ENV OSMNBI_LOG_LEVEL                            DEBUG
+# ENV OSMNBI_SERVER_ENABLE_TEST                   False
+
 # message
 ENV OSMNBI_MESSAGE_DRIVER                       kafka
 ENV OSMNBI_MESSAGE_HOST                         kafka
@@ -80,8 +82,13 @@ ENV OSMNBI_MESSAGE_PORT                         9092
 # authentication
 ENV OSMNBI_AUTHENTICATION_BACKEND               internal
 #ENV OSMNBI_AUTHENTICATION_BACKEND               keystone
-#ENV OSMNBI_AUTHENTICATION_AUTH_URL              keystone
+#ENV OSMNBI_AUTHENTICATION_AUTH_URL              http://keystone:5000/v3
 #ENV OSMNBI_AUTHENTICATION_AUTH_PORT             5000
+
+# DOMAIN_NAME can be a single value or a comma separated list of values. The first value is for internal domain
+# meanwhile the rest ones are external identity services as e.g. LDAP
+# for the case of USER_DOMAIN_NAME each item can be suffixed with ":ro" (read only). In this case NBI will reject any
+# operationi of create/update/delete users in this domain. Do not suffix PROJECT_DOMAIN_NAME
 #ENV OSMNBI_AUTHENTICATION_USER_DOMAIN_NAME      default
 #ENV OSMNBI_AUTHENTICATION_PROJECT_DOMAIN_NAME   default
 #ENV OSMNBI_AUTHENTICATION_SERVICE_USERNAME      nbi
@@ -90,9 +97,13 @@ ENV OSMNBI_AUTHENTICATION_BACKEND               internal
 # RBAC
 ENV OSMNBI_RBAC_RESOURCES_TO_OPERATIONS         /app/NBI/osm_nbi/resources_to_operations.yml
 ENV OSMNBI_RBAC_ROLES_TO_OPERATIONS             /app/NBI/osm_nbi/roles_to_operations.yml
+# prometheus
+ENV OSMNBI_PROMETHEUS_HOST                      prometheus
+ENV OSMNBI_PROMETHEUS_PORT                      9090
 
 # Copy the current directory contents into the container at /app
 ADD . /app/NBI
 
 # Run app.py when the container launches
-CMD ["python3", "nbi.py"]
+CMD python3 -m osm_nbi.nbi
+