X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=docker%2FDockerfile;h=27cb519814b35571ba3d3b4353be164c87f5264c;hb=be034667d2c58d33bd3657b82bb93d2021da8c73;hp=f9f610a745707b1d33802c1653d445d4ff2213c1;hpb=de3d570360a0a31d3054a6ff72b09ae9f559b59c;p=osm%2FMON.git

diff --git a/docker/Dockerfile b/docker/Dockerfile
index f9f610a..27cb519 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -25,7 +25,7 @@ FROM ubuntu:16.04
 LABEL authors="Benjamín Díaz"
 
 RUN apt-get --yes update \
- && apt-get --yes install git python3 python3-pip libmysqlclient-dev libssl-dev libffi-dev \
+ && apt-get --yes install git python3 python3-pip libmysqlclient-dev libssl-dev libffi-dev mysql-client \
  && pip3 install pip==9.0.3
 
 COPY requirements.txt /mon/requirements.txt
@@ -36,14 +36,16 @@ COPY . /mon
 
 RUN pip3 install /mon
 
-ENV BROKER_URI kafka:9092
-ENV MONGO_URI mongodb://mongo:27017
-ENV DATABASE sqlite:///mon_sqlite.db
-ENV OS_NOTIFIER_URI localhost:8662
-ENV OS_DEFAULT_GRANULARITY 300
-ENV REQUEST_TIMEOUT 10
-ENV OSMMON_LOG_LEVEL INFO
-ENV OSMMON_KAFKA_LOG_LEVEL INFO
+ENV OSMMON_MESSAGE_DRIVER kafka
+ENV OSMMON_MESSAGE_HOST kafka
+ENV OSMMON_MESSAGE_PORT 9092
+
+ENV OSMMON_DATABASE_DRIVER mongo
+ENV OSMMON_DATABASE_URI mongodb://mongo:27017
+
+ENV OSMMON_SQL_DATABASE_URI sqlite:///mon_sqlite.db
+ENV OSMMON_GLOBAL_REQUEST_TIMEOUT 10
+ENV OSMMON_GLOBAL_LOGLEVEL INFO
 ENV OSMMON_VCA_HOST localhost
 ENV OSMMON_VCA_SECRET secret
 ENV OSMMON_VCA_USER admin
@@ -54,4 +56,7 @@ ENV OSMMON_PROMETHEUS_URL http://prometheus:9090
 
 EXPOSE 8000
 
-CMD /bin/bash mon/docker/scripts/runInstall.sh
+HEALTHCHECK --interval=5s --timeout=2s --retries=12 \
+  CMD osm-mon-healthcheck || exit 1
+
+CMD /bin/bash mon/docker/scripts/start.sh