X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FMON%2FDockerfile;h=eefb5fbd9107e71c4800ba74f418ed8428420c67;hb=da0e40f9a97f7517c1f4a49d6759f4063078f525;hp=26a74e6d693c82fc16b01c8ec4236bfac38df6c1;hpb=454bffe5e7784590aff641121ddb1da6739c1ee6;p=osm%2Fdevops.git

diff --git a/docker/MON/Dockerfile b/docker/MON/Dockerfile
index 26a74e6d..eefb5fbd 100644
--- a/docker/MON/Dockerfile
+++ b/docker/MON/Dockerfile
@@ -20,32 +20,32 @@
 # contact: bdiaz@whitestack.com or glavado@whitestack.com
 ##
 
-FROM ubuntu:16.04
+FROM ubuntu:20.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 \
-                          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
+    && python3 -m pip install --upgrade pip
+RUN python3 --version && pip --version
 
-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
+RUN python3 -m pip install 'pyyaml>=5.1.2' 'paramiko' 'chardet==3.0.4' \
+          'lxml==4.6.2' 'humanfriendly==9.0.*' 'aiokafka>=0.7.0' \
+          'prometheus_client==0.4.*' 'python-keystoneclient==3.15.*' \
+          'six==1.15.0' 'requests==2.25.*' 'gnocchiclient==7.0.*' \
+          'pyvcloud==23.0.*' 'python-novaclient==12.0.*' \
+          'python-ceilometerclient==2.9.*' 'python-neutronclient==5.1.*'
 
 ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
-ARG RELEASE=ReleaseFOUR-daily
+ARG RELEASE=ReleaseNINE-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.4"
+
 COPY scripts/ scripts/
 
 ENV OSMMON_MESSAGE_DRIVER kafka
@@ -75,14 +79,18 @@ 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
 
-HEALTHCHECK --start-period=120s --interval=10s --timeout=5s --retries=5 \
+HEALTHCHECK --start-period=120s --interval=5s --timeout=2s --retries=12\
   CMD osm-mon-healthcheck || exit 1
 
 CMD /bin/bash scripts/start.sh