X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FNBI%2FDockerfile;h=0771c74fbd5110d474c1e4a79aec78b4ade2b5e7;hb=refs%2Fchanges%2F84%2F7784%2F1;hp=d2d0c3615e9ff04e8e26a7d1ec839822e4493bbd;hpb=de6a5cfb63166480a7a0b04f6e0d0e34f0435df6;p=osm%2Fdevops.git diff --git a/docker/NBI/Dockerfile b/docker/NBI/Dockerfile index d2d0c361..0771c74f 100644 --- a/docker/NBI/Dockerfile +++ b/docker/NBI/Dockerfile @@ -7,7 +7,7 @@ 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 cherrypy==18.0.0 pyangbind keystoneauth1 \ + && pip3 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 @@ -51,8 +51,10 @@ ENV OSMNBI_SOCKET_PORT 9999 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 @@ -75,8 +77,11 @@ ENV OSMNBI_AUTHENTICATION_BACKEND internal #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