Merge v8.0 Into Master

[osm/devops.git] / docker / POL / Dockerfile

diff --git a/docker/POL/Dockerfile b/docker/POL/Dockerfile
index 1eb8634..43a271e 100644 (file)
--- a/docker/POL/Dockerfile
+++ b/docker/POL/Dockerfile
@@ -24,18 +24,13 @@ FROM ubuntu:16.04
 
 LABEL authors="Benjamín Díaz"
 
-RUN apt-get --yes update \
- && apt-get --yes install python3 python3-pip libmysqlclient-dev git \
- && pip3 install pip==9.0.3
-
-RUN apt-get update && apt-get -y install curl software-properties-common
-
 RUN apt-get --yes update \
  && apt-get --yes install git python python-pip python3 python3-pip libmysqlclient-dev libssl-dev libffi-dev \
+ && apt-get --yes install mysql-client curl software-properties-common \
  && pip3 install pip==9.0.3
 
 ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
-ARG RELEASE=ReleaseFOUR-daily
+ARG RELEASE=ReleaseEIGHT-daily
 ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg
 ARG REPOSITORY=testing
 
@@ -47,6 +42,8 @@ ARG COMMON_VERSION
 
 RUN apt-get --yes update  && apt-get -y install python3-osm-policy-module${POL_VERSION}
 
+COPY scripts/ scripts/
+
 ENV OSMPOL_MESSAGE_DRIVER kafka
 ENV OSMPOL_MESSAGE_HOST kafka
 ENV OSMPOL_MESSAGE_PORT 9092
@@ -56,6 +53,9 @@ ENV OSMPOL_DATABASE_URI mongodb://mongo:27017
 
 ENV OSMPOL_SQL_DATABASE_URI sqlite:///mon_sqlite.db
 
-ENV OSMPOL_LOG_LEVEL INFO
+ENV OSMPOL_GLOBAL_LOG_LEVEL INFO
+
+HEALTHCHECK --start-period=120s --interval=10s --timeout=5s --retries=5 \
+  CMD osm-pol-healthcheck || exit 1
 
-CMD osm-policy-agent
+CMD /bin/bash scripts/start.sh