+##
+# Copyright 2019 ETSI
+#
+# 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
+FROM ubuntu:18.04
-RUN apt-get update && apt-get -y install curl software-properties-common
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install curl software-properties-common
-RUN apt-get update && apt-get install -y git python3 python3-jsonschema \
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive 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 pyangbind keystoneauth1 \
+ && pip3 install -U pip \
+ && python3 -m pip install aiokafka==0.6.0 aiohttp cherrypy==18.1.2 pyangbind keystoneauth1 \
&& mkdir -p /app/storage/kafka && mkdir -p /app/log
ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
-ARG RELEASE=ReleaseFOUR-daily
+ARG RELEASE=ReleaseEIGHT-daily
ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg
ARG REPOSITORY=testing
# server
ENV OSMNBI_SOCKET_HOST 0.0.0.0
ENV OSMNBI_SOCKET_PORT 9999
+ENV OSMNBI_SERVER_SSL_CERTIFICATE /app/osm_nbi/http/cert.pem
+ENV OSMNBI_SERVER_SSL_PRIVATE_KEY /app/osm_nbi/http/privkey.pem
# storage
ENV OSMNBI_STORAGE_PATH /app/storage
# database
ENV OSMNBI_DATABASE_DRIVER mongo
-ENV OSMNBI_DATABASE_HOST mongo
-ENV OSMNBI_DATABASE_PORT 27017
+ENV OSMNBI_DATABASE_URI mongodb://mongo:27017
+#ENV OSMNBI_DATABASE_HOST mongo
+#ENV OSMNBI_DATABASE_PORT 27017
+
# web
ENV OSMNBI_STATIC_DIR /app/osm_nbi/html_public
-# logs
-ENV OSMNBI_LOG_FILE /app/log
-ENV OSMNBI_LOG_LEVEL DEBUG
# message
ENV OSMNBI_MESSAGE_DRIVER kafka
ENV OSMNBI_MESSAGE_HOST kafka
#ENV OSMNBI_AUTHENTICATION_SERVICE_USERNAME nbi
#ENV OSMNBI_AUTHENTICATION_SERVICE_PASSWORD nbi
#ENV OSMNBI_AUTHENTICATION_SERVICE_PROJECT service
+#prometheus
+ENV OSMNBI_PROMETHEUS_HOST prometheus
+ENV OSMNBI_PROMETHEUS_PORT 9090
-HEALTHCHECK --interval=5s --timeout=2s --retries=12 \
+HEALTHCHECK --start-period=120s --interval=10s --timeout=5s --retries=5 \
CMD curl -k https://localhost:9999/osm/ | grep Welcome || exit 1
# Run app.py when the container launches
-CMD ["python3", "/usr/lib/python3/dist-packages/osm_nbi/nbi.py"]
+CMD python3 -m osm_nbi.nbi
+