X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FNBI%2FDockerfile;h=c8ac78f838fc2c1ac67ff80013e1afc255d87110;hb=refs%2Fchanges%2F55%2F10455%2F1;hp=87fa0ac310904291117c0a346d41e9ffff975347;hpb=bdb48026e8a6406043d31b61b56691c09a238bca;p=osm%2Fdevops.git

diff --git a/docker/NBI/Dockerfile b/docker/NBI/Dockerfile
index 87fa0ac3..c8ac78f8 100644
--- a/docker/NBI/Dockerfile
+++ b/docker/NBI/Dockerfile
@@ -1,17 +1,45 @@
+##
+# 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 && DEBIAN_FRONTEND=noninteractive apt-get -y install curl software-properties-common
+
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y git python3 python3-dev python3-pip
+
+RUN python3 -m pip install --upgrade pip
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y rustc cargo
 
-RUN apt-get update && apt-get -y install curl software-properties-common
+RUN python3 --version && python3 -m pip --version
 
-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 aiohttp cherrypy==18.0.0 pyangbind keystoneauth1 \
+RUN rustc --version && cargo --version
+
+RUN python3 -m pip install --upgrade setuptools setuptools-rust
+
+RUN python3 -m pip install --upgrade aiokafka dataclasses python-keystoneclient pymongo jsonschema \
+                                     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=ReleaseNINE-daily
 ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg
 ARG REPOSITORY=testing
 
@@ -22,7 +50,7 @@ ARG NBI_VERSION
 ARG COMMON_VERSION
 ARG IM_VERSION
 
-RUN apt-get update && apt-get -y install python3-osm-nbi${NBI_VERSION} python3-osm-common${COMMON_VERSION} python3-osm-im${IM_VERSION}
+RUN apt-get update &&DEBIAN_FRONTEND=noninteractive apt-get -y install python3-osm-nbi${NBI_VERSION} python3-osm-common${COMMON_VERSION} python3-osm-im${IM_VERSION}
 
 # Set the working directory to /app
 WORKDIR /app/osm_nbi
@@ -47,6 +75,8 @@ VOLUME /app/log
 # 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
@@ -57,9 +87,6 @@ ENV OSMNBI_DATABASE_URI   mongodb://mongo: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
@@ -81,8 +108,9 @@ ENV OSMNBI_AUTHENTICATION_BACKEND               internal
 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
+