X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FPOL%2FDockerfile;h=f143b62abbb5426af3265d7ce9b4fe1840fa0453;hb=9687207f24cc4ff95c6b0bd147d658c99c47ab93;hp=6de7c717b789aba0d104bdaf65b3f790848612b5;hpb=deb99f3d1a8146019676d888f1206b4e272a10ba;p=osm%2Fdevops.git diff --git a/docker/POL/Dockerfile b/docker/POL/Dockerfile index 6de7c717..f143b62a 100644 --- a/docker/POL/Dockerfile +++ b/docker/POL/Dockerfile @@ -20,17 +20,19 @@ # 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 \ - && 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 +RUN DEBIAN_FRONTEND=noninteractive apt-get -y update \ + && DEBIAN_FRONTEND=noninteractive apt-get -y install \ + git python3 python3-pip libmysqlclient-dev libssl-dev libffi-dev \ + mysql-client curl software-properties-common + +RUN pip3 install pip==21.0.1 ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian -ARG RELEASE=ReleaseFOUR-daily +ARG RELEASE=ReleaseNINE-daily ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg ARG REPOSITORY=testing @@ -40,7 +42,8 @@ RUN add-apt-repository -y "deb ${REPOSITORY_BASE}/${RELEASE} ${REPOSITORY} POL c ARG POL_VERSION ARG COMMON_VERSION -RUN apt-get --yes update && apt-get -y install python3-osm-policy-module${POL_VERSION} +RUN DEBIAN_FRONTEND=noninteractive apt-get -y update \ + && DEBIAN_FRONTEND=noninteractive apt-get -y install python3-osm-policy-module${POL_VERSION} COPY scripts/ scripts/ @@ -55,7 +58,7 @@ ENV OSMPOL_SQL_DATABASE_URI sqlite:///mon_sqlite.db ENV OSMPOL_GLOBAL_LOG_LEVEL INFO -HEALTHCHECK --interval=5s --timeout=2s --retries=12 \ +HEALTHCHECK --start-period=120s --interval=10s --timeout=5s --retries=5 \ CMD osm-pol-healthcheck || exit 1 CMD /bin/bash scripts/start.sh