Merge v8.0 Into Master

[osm/devops.git] / docker / MON / Dockerfile

diff --git a/docker/MON/Dockerfile b/docker/MON/Dockerfile
index 26a74e6..a91b957 100644 (file)
--- a/docker/MON/Dockerfile
+++ b/docker/MON/Dockerfile
@@ -20,12 +20,12 @@
 # contact: bdiaz@whitestack.com or glavado@whitestack.com
 ##
 
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 LABEL authors="Guillermo Calvino"
 
 RUN apt-get update \
-    && apt-get -y install curl \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y curl \
                           software-properties-common \
                           git \
                           python \
@@ -38,14 +38,14 @@ RUN apt-get update \
                           mysql-client \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
-    && pip3 install pip==9.0.3
+    && python3 -m pip install -U pip
 
 RUN pip3 install  'macaroonbakery>=1.1,<2.0' 'pyRFC3339>=1.0,<2.0' \
       'pyyaml>=5.1.2' 'theblues>=0.3.8,<1.0' 'websockets>=4.0,<5.0' \
-      'paramiko'   # PyNaCl
+      'paramiko' 'dogpile.cache==0.9.2'
 
 ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
-ARG RELEASE=ReleaseFOUR-daily
+ARG RELEASE=ReleaseEIGHT-daily
 ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg
 ARG REPOSITORY=testing
 
@@ -56,9 +56,13 @@ ARG 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} \
+    && DEBIAN_FRONTEND=noninteractive 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==2.8.2"
+
 COPY scripts/ scripts/
 
 ENV OSMMON_MESSAGE_DRIVER kafka
@@ -75,10 +79,14 @@ 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
 ENV OSMMON_PROMETHEUS_URL http://prometheus:9090
+ENV OSMMON_GRAFANA_URL http://grafana:3000
+ENV OSMMON_GRAFANA_USER admin
+ENV OSMMON_GRAFANA_PASSWORD admin
 
 EXPOSE 8000