projects
/
osm
/
MON.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changes way of getting VCA application name corresponding to vdu and vnf
[osm/MON.git]
/
docker
/
Dockerfile
diff --git
a/docker/Dockerfile
b/docker/Dockerfile
index
f843908
..
8079f23
100644
(file)
--- a/
docker/Dockerfile
+++ b/
docker/Dockerfile
@@
-41,7
+41,7
@@
ENV MONGO_URI mongodb://mongo:27017
ENV DATABASE sqlite:///mon_sqlite.db
ENV OS_NOTIFIER_URI localhost:8662
ENV OS_DEFAULT_GRANULARITY 300
ENV DATABASE sqlite:///mon_sqlite.db
ENV OS_NOTIFIER_URI localhost:8662
ENV OS_DEFAULT_GRANULARITY 300
-ENV REQUEST_TIMEOUT 10
+ENV
OSMMON_
REQUEST_TIMEOUT 10
ENV OSMMON_LOG_LEVEL INFO
ENV OSMMON_KAFKA_LOG_LEVEL INFO
ENV OSMMON_VCA_HOST localhost
ENV OSMMON_LOG_LEVEL INFO
ENV OSMMON_KAFKA_LOG_LEVEL INFO
ENV OSMMON_VCA_HOST localhost
@@
-50,7
+50,11
@@
ENV OSMMON_VCA_USER admin
ENV OSMMON_DATABASE_COMMONKEY changeme
ENV OSMMON_COLLECTOR_INTERVAL 30
ENV OSMMON_EVALUATOR_INTERVAL 30
ENV OSMMON_DATABASE_COMMONKEY changeme
ENV OSMMON_COLLECTOR_INTERVAL 30
ENV OSMMON_EVALUATOR_INTERVAL 30
+ENV OSMMON_PROMETHEUS_URL http://prometheus:9090
-EXPOSE 8662 8000
+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/runInstall.sh