X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FMON%2FDockerfile;h=96e1633fb11da6ad0aca0754baaa763996fb0272;hb=ca079d7049c9636883c737fd7e115b2d244e8ace;hp=6fb35cc1edb886487401851da31a1286d3f0e515;hpb=03ceed359b7f079712e20f105dc8328d37c44b2f;p=osm%2Fdevops.git

diff --git a/docker/MON/Dockerfile b/docker/MON/Dockerfile
index 6fb35cc1..96e1633f 100644
--- a/docker/MON/Dockerfile
+++ b/docker/MON/Dockerfile
@@ -24,47 +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 pip3 install  'macaroonbakery>=1.1,<2.0' 'pyRFC3339>=1.0,<2.0' \
-      'pyyaml>=3.0,<4.0' 'theblues>=0.3.8,<1.0' 'websockets>=4.0,<5.0' \
-      'paramiko'   # PyNaCl
+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 pip3 install 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
 
-HEALTHCHECK --interval=5s --timeout=2s --retries=12 \
+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