projects
/
osm
/
MON.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 1842: LTS Support
[osm/MON.git]
/
docker
/
Dockerfile
diff --git
a/docker/Dockerfile
b/docker/Dockerfile
index
dca983c
..
bc6f94a
100644
(file)
--- a/
docker/Dockerfile
+++ b/
docker/Dockerfile
@@
-20,18
+20,22
@@
# contact: bdiaz@whitestack.com or glavado@whitestack.com
##
# 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 \
LABEL authors="Benjamín Díaz"
RUN apt-get --yes update \
- && apt-get --yes install git python3 python3-pip lib
mysqlclient-dev lib
ssl-dev libffi-dev \
- && p
ip3 install pip==9.0.3
+ && apt-get --yes install git python3 python3-pip libssl-dev libffi-dev \
+ && p
ython3 -m pip install -U pip
COPY requirements.txt /mon/requirements.txt
COPY requirements.txt /mon/requirements.txt
+COPY requirements-dev.txt /mon/requirements-dev.txt
+
RUN pip3 install -r /mon/requirements.txt
RUN pip3 install -r /mon/requirements.txt
+RUN pip3 install -r /mon/requirements-dev.txt
+
COPY . /mon
RUN pip3 install /mon
COPY . /mon
RUN pip3 install /mon
@@
-44,20
+48,26
@@
ENV OSMMON_DATABASE_DRIVER mongo
ENV OSMMON_DATABASE_URI mongodb://mongo:27017
ENV OSMMON_SQL_DATABASE_URI sqlite:///mon_sqlite.db
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_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_DATABASE_COMMONKEY changeme
ENV OSMMON_COLLECTOR_INTERVAL 30
ENV OSMMON_EVALUATOR_INTERVAL 30
ENV OSMMON_PROMETHEUS_URL http://prometheus:9090
+ENV OSMMON_PROMETHEUS_USER admin
+ENV OSMMON_PROMETHEUS_PASSWORD admin
+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
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