projects
/
osm
/
POL.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update requirements-dev.in to follow branch v12.0 instead of master
[osm/POL.git]
/
docker
/
Dockerfile
diff --git
a/docker/Dockerfile
b/docker/Dockerfile
index
91bc5f6
..
93a4eeb
100644
(file)
--- a/
docker/Dockerfile
+++ b/
docker/Dockerfile
@@
-20,17
+20,19
@@
# 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"
+LABEL authors="Benjamín Díaz
, Fabián Bravo
"
RUN apt-get --yes update \
RUN apt-get --yes update \
- && apt-get --yes install python3
python3-pip libmysqlclient-dev git
\
- && pip3 install pip==
9.0.3
+ && apt-get --yes install python3
=3.8.* python3-pip=20.0.* libmysqlclient-dev=8.0.* git mysql-client=8.0.*
\
+ && pip3 install pip==
21.3.1
COPY requirements.txt /policy_module/requirements.txt
COPY requirements.txt /policy_module/requirements.txt
+COPY requirements-dev.txt /policy_module/requirements-dev.txt
RUN pip3 install -r /policy_module/requirements.txt
RUN pip3 install -r /policy_module/requirements.txt
+RUN pip3 install -r /policy_module/requirements-dev.txt
COPY . /policy_module
COPY . /policy_module
@@
-45,7
+47,9
@@
ENV OSMPOL_DATABASE_URI mongodb://mongo:27017
ENV OSMPOL_SQL_DATABASE_URI sqlite:///policy_module.db
ENV OSMPOL_SQL_DATABASE_URI sqlite:///policy_module.db
-ENV OSMPOL_LOG_LEVEL INFO
-ENV OSMPOL_KAFKA_LOG_LEVEL WARN
+ENV OSMPOL_GLOBAL_LOGLEVEL INFO
-CMD osm-policy-agent
+HEALTHCHECK --interval=10s --timeout=5s --retries=10 --start-period=30s \
+ CMD osm-pol-healthcheck || exit 1
+
+CMD /bin/bash /policy_module/docker/scripts/start.sh