projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrading PyYaml due to new juju package - MON devops dockerfile
[osm/devops.git]
/
docker
/
MON
/
Dockerfile
diff --git
a/docker/MON/Dockerfile
b/docker/MON/Dockerfile
index
2fb0800
..
26a74e6
100644
(file)
--- a/
docker/MON/Dockerfile
+++ b/
docker/MON/Dockerfile
@@
-41,7
+41,7
@@
RUN apt-get update \
&& pip3 install pip==9.0.3
RUN pip3 install 'macaroonbakery>=1.1,<2.0' 'pyRFC3339>=1.0,<2.0' \
&& pip3 install pip==9.0.3
RUN pip3 install 'macaroonbakery>=1.1,<2.0' 'pyRFC3339>=1.0,<2.0' \
- 'pyyaml>=
3.0,<4.0
' 'theblues>=0.3.8,<1.0' 'websockets>=4.0,<5.0' \
+ 'pyyaml>=
5.1.2
' 'theblues>=0.3.8,<1.0' 'websockets>=4.0,<5.0' \
'paramiko' # PyNaCl
ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
'paramiko' # PyNaCl
ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
@@
-82,7
+82,7
@@
ENV OSMMON_PROMETHEUS_URL http://prometheus:9090
EXPOSE 8000
EXPOSE 8000
-HEALTHCHECK --
interval=5s --timeout=2s --retries=12
\
+HEALTHCHECK --
start-period=120s --interval=10s --timeout=5s --retries=5
\
CMD osm-mon-healthcheck || exit 1
CMD /bin/bash scripts/start.sh
CMD osm-mon-healthcheck || exit 1
CMD /bin/bash scripts/start.sh