X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FNBI%2FDockerfile;h=094d02904489f3f681f00d439580dfe832cca2cc;hb=refs%2Fchanges%2F67%2F7967%2F2;hp=87fa0ac310904291117c0a346d41e9ffff975347;hpb=bdb48026e8a6406043d31b61b56691c09a238bca;p=osm%2Fdevops.git diff --git a/docker/NBI/Dockerfile b/docker/NBI/Dockerfile index 87fa0ac3..094d0290 100644 --- a/docker/NBI/Dockerfile +++ b/docker/NBI/Dockerfile @@ -1,3 +1,21 @@ +## +# 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 @@ -6,8 +24,8 @@ RUN apt-get update && apt-get -y install curl software-properties-common 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 \ + && pip3 install -U pip \ + && python3 -m pip install aiokafka aiohttp cherrypy==18.0.0 pyangbind keystoneauth1 \ && mkdir -p /app/storage/kafka && mkdir -p /app/log ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian @@ -81,7 +99,7 @@ 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