X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FMON%2FDockerfile;h=4b83d8ebe75f90b37fa013d0cc74505f9c5705ab;hb=c0515545140209166361c813e593e687708ff831;hp=5063135e06dc6be5be391b1eb6e6e93d36011955;hpb=6c8cb573d4d2ab4a4454ee73cb4744722e32a8a1;p=osm%2Fdevops.git

diff --git a/docker/MON/Dockerfile b/docker/MON/Dockerfile
index 5063135e..4b83d8eb 100644
--- a/docker/MON/Dockerfile
+++ b/docker/MON/Dockerfile
@@ -24,40 +24,63 @@ FROM ubuntu:16.04
 
 LABEL authors="Guillermo Calvino"
 
-RUN apt-get update && apt-get -y install curl software-properties-common
-
-RUN apt-get --yes update \
- && apt-get --yes install git python python-pip python3 python3-pip libmysqlclient-dev libssl-dev libffi-dev \
- && pip3 install pip==9.0.3
+RUN apt-get update \
+    && apt-get -y install curl \
+                          software-properties-common \
+                          git \
+                          python \
+                          python-pip \
+                          python3 \
+                          python3-pip \
+                          libmysqlclient-dev \
+                          libssl-dev \
+                          libffi-dev \
+                          mysql-client \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && pip3 install pip==9.0.3
+
+RUN python3 -m pip install -U juju
 
 ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
 ARG RELEASE=ReleaseFOUR-daily
 ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg
 ARG REPOSITORY=testing
 
-RUN curl ${REPOSITORY_BASE}/${RELEASE}/${REPOSITORY_KEY} | apt-key add -
-RUN add-apt-repository -y "deb ${REPOSITORY_BASE}/${RELEASE} ${REPOSITORY} MON N2VC common" && apt update
-
 ARG MON_VERSION
 ARG COMMON_VERSION
 ARG N2VC_VERSION
 
-RUN apt-get --yes update  && apt-get -y install python3-osm-common${COMMON_VERSION} python3-osm-mon${MON_VERSION} python3-n2vc${N2VC_VERSION}
-
+RUN curl ${REPOSITORY_BASE}/${RELEASE}/${REPOSITORY_KEY} | apt-key add - \
+    && add-apt-repository -y "deb ${REPOSITORY_BASE}/${RELEASE} ${REPOSITORY} MON N2VC common" \
+    && apt update \
+    && apt-get -y install python3-osm-common${COMMON_VERSION} \
+                          python3-osm-mon${MON_VERSION} \
+                          python3-n2vc${N2VC_VERSION}
 COPY scripts/ scripts/
 
-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_OPENSTACK_DEFAULT_GRANULARITY 300
+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
+ENV OSMMON_DATABASE_COMMONKEY changeme
+ENV OSMMON_COLLECTOR_INTERVAL 30
+ENV OSMMON_EVALUATOR_INTERVAL 30
+ENV OSMMON_PROMETHEUS_URL http://prometheus:9090
+
+EXPOSE 8000
 
-EXPOSE 8662 8000
+HEALTHCHECK --start-period=120s --interval=10s --timeout=5s --retries=5 \
+  CMD osm-mon-healthcheck || exit 1
 
-CMD /bin/bash scripts/runInstall.sh
+CMD /bin/bash scripts/start.sh