X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FDockerfile;h=e9d355de1c104887267be45e9478d6246885f373;hb=4b9f79e2820a011f6ebbba7fb92cdc120b364650;hp=dca983c2c70f5f29014c194d5abe0f71353ce2a0;hpb=5ac7c081ca13495185ecf6bdf302c16c25a4b759;p=osm%2FMON.git

diff --git a/docker/Dockerfile b/docker/Dockerfile
index dca983c..e9d355d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -20,13 +20,13 @@
 # contact: bdiaz@whitestack.com or glavado@whitestack.com
 ##
 
-FROM ubuntu:16.04
+FROM ubuntu:20.04
 
 LABEL authors="Benjamín Díaz"
 
 RUN apt-get --yes update \
- && apt-get --yes install git python3 python3-pip libmysqlclient-dev libssl-dev libffi-dev \
- && pip3 install pip==9.0.3
+ && apt-get --yes install git python3 python3-pip libssl-dev libffi-dev \
+ && python3 -m pip install -U pip
 
 COPY requirements.txt /mon/requirements.txt
 
@@ -44,20 +44,23 @@ ENV OSMMON_DATABASE_DRIVER mongo
 ENV OSMMON_DATABASE_URI mongodb://mongo:27017
 
 ENV OSMMON_SQL_DATABASE_URI sqlite:///mon_sqlite.db
-ENV OSMMON_OPENSTACK_DEFAULT_GRANULARITY 300
 ENV OSMMON_GLOBAL_REQUEST_TIMEOUT 10
 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 --interval=5s --timeout=2s --retries=12 \
   CMD osm-mon-healthcheck || exit 1
 
-CMD /bin/bash mon/docker/scripts/runInstall.sh
+CMD /bin/bash mon/docker/scripts/start.sh