X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FMON%2FDockerfile;h=77aa909f5303d3c1e88005ae9f8c72b4a4f77b79;hb=5e151f026049dbdffd085fb9796a6e53dc64ec94;hp=2fb08006cf11c72ebe96246bbf23606c65442667;hpb=9261c66ac5eeebaa5e2569694579ed16d4e70626;p=osm%2Fdevops.git

diff --git a/docker/MON/Dockerfile b/docker/MON/Dockerfile
index 2fb08006..77aa909f 100644
--- a/docker/MON/Dockerfile
+++ b/docker/MON/Dockerfile
@@ -41,7 +41,7 @@ RUN apt-get update \
     && 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' \
+      'pyyaml>=5.1.2' 'theblues>=0.3.8,<1.0' 'websockets>=4.0,<5.0' \
       'paramiko'   # PyNaCl
 
 ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
@@ -59,6 +59,10 @@ RUN curl ${REPOSITORY_BASE}/${RELEASE}/${REPOSITORY_KEY} | apt-key add - \
     && apt-get -y install python3-osm-common${COMMON_VERSION} \
                           python3-osm-mon${MON_VERSION} \
                           python3-n2vc${N2VC_VERSION}
+
+
+RUN python3 -m pip install -U juju
+
 COPY scripts/ scripts/
 
 ENV OSMMON_MESSAGE_DRIVER kafka
@@ -75,6 +79,7 @@ ENV OSMMON_GLOBAL_LOGLEVEL INFO
 ENV OSMMON_VCA_HOST localhost
 ENV OSMMON_VCA_SECRET secret
 ENV OSMMON_VCA_USER admin
+ENV OSMMON_VCA_CACERT cacert
 ENV OSMMON_DATABASE_COMMONKEY changeme
 ENV OSMMON_COLLECTOR_INTERVAL 30
 ENV OSMMON_EVALUATOR_INTERVAL 30
@@ -82,7 +87,7 @@ 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/start.sh