From 45d46f447cf2821d8a6fc16272924ec0058329b1 Mon Sep 17 00:00:00 2001 From: palsus Date: Mon, 18 Jan 2021 08:36:26 +0000 Subject: [PATCH] Fix for Bug 1397: Inconsistent behaviour between MON image in dockerhub and MON image built from git repo Change-Id: I8f66786134cf08d91a70b9da7ddfbb1a5ca03800 Signed-off-by: palsus (cherry picked from commit e3cecd90b15c05a04df7eca459e2a35a4bf31df8) --- docker/MON/Dockerfile | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/docker/MON/Dockerfile b/docker/MON/Dockerfile index fdcdd4c7..506561d0 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,21 +28,20 @@ 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 -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 pip3 install 'pyyaml>=5.1.2' 'paramiko' 'chardet==3.0.4' \ + 'lxml==4.6.2' 'humanfriendly==9.0.*' 'aiokafka==0.6.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=ReleaseNINE-daily @@ -90,7 +89,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 -- 2.25.1