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

diff --git a/docker/MON/Dockerfile b/docker/MON/Dockerfile
index a91b957d..eefb5fbd 100644
--- a/docker/MON/Dockerfile
+++ b/docker/MON/Dockerfile
@@ -20,7 +20,7 @@
 # contact: bdiaz@whitestack.com or glavado@whitestack.com
 ##
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 LABEL authors="Guillermo Calvino"
 
@@ -28,24 +28,24 @@ RUN apt-get update \
     && 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/* \
-    && python3 -m pip install -U pip
+    && 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' 'dogpile.cache==0.9.2'
+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=ReleaseEIGHT-daily
+ARG RELEASE=ReleaseNINE-daily
 ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg
 ARG REPOSITORY=testing
 
@@ -61,7 +61,7 @@ RUN curl ${REPOSITORY_BASE}/${RELEASE}/${REPOSITORY_KEY} | apt-key add - \
                           python3-n2vc${N2VC_VERSION}
 
 
-RUN python3 -m pip install -U "juju==2.8.2"
+RUN python3 -m pip install -U "juju==2.8.4"
 
 COPY scripts/ scripts/
 
@@ -90,7 +90,7 @@ 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