X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FPOL%2FDockerfile;h=f264fba993c663b8d15f833ef70b325378fca3a1;hb=refs%2Fchanges%2F15%2F13515%2F3;hp=b807bfdb5f70b3e14277f38bcba01650781c9d3d;hpb=e5b9ba619c48d8768a3e75ed35883c034c38e107;p=osm%2Fdevops.git diff --git a/docker/POL/Dockerfile b/docker/POL/Dockerfile index b807bfdb..f264fba9 100644 --- a/docker/POL/Dockerfile +++ b/docker/POL/Dockerfile @@ -15,7 +15,7 @@ # limitations under the License. ####################################################################################### -FROM ubuntu:20.04 as INSTALL +FROM ubuntu:22.04 as INSTALL ARG APT_PROXY RUN if [ ! -z $APT_PROXY ] ; then \ @@ -25,12 +25,15 @@ RUN if [ ! -z $APT_PROXY ] ; then \ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ DEBIAN_FRONTEND=noninteractive apt-get --yes install \ - gcc=4:9.3.* \ - python3=3.8.* \ - python3-dev=3.8.* \ - python3-pip=20.0.2* \ - python3-setuptools=45.2.* \ - curl=7.68.* + gcc=4:11.* \ + python3=3.10.* \ + python3-dev=3.10.* \ + python3-pip=22.0.* \ + curl=7.81.* \ + && rm -rf /var/lib/apt/lists/* + +####################################################################################### +# End of common prepration RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ DEBIAN_FRONTEND=noninteractive apt-get --yes install \ @@ -50,7 +53,7 @@ RUN pip3 install \ -r /usr/lib/python3/dist-packages/osm_policy_module/requirements.txt ####################################################################################### -FROM ubuntu:20.04 as FINAL +FROM ubuntu:22.04 as FINAL ARG APT_PROXY RUN if [ ! -z $APT_PROXY ] ; then \ @@ -60,13 +63,19 @@ RUN if [ ! -z $APT_PROXY ] ; then \ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ DEBIAN_FRONTEND=noninteractive apt-get --yes install \ - python3-minimal=3.8.* \ + python3-minimal=3.10.* \ && rm -rf /var/lib/apt/lists/* -RUN rm -f /etc/apt/apt.conf.d/proxy.conf - COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages -COPY --from=INSTALL /usr/local/lib/python3.8/dist-packages /usr/local/lib/python3.8/dist-packages +COPY --from=INSTALL /usr/local/lib/python3.10/dist-packages /usr/local/lib/python3.10/dist-packages + +####################################################################################### +# End of common prepration +RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ + DEBIAN_FRONTEND=noninteractive apt-get --yes install \ + libmd0 \ + && rm -rf /var/lib/apt/lists/* + COPY --from=INSTALL /usr/bin/osm* /usr/bin/ COPY --from=INSTALL /usr/bin/mysql /usr/bin/ COPY --from=INSTALL /usr/bin/mysqladmin /usr/bin/ @@ -102,6 +111,10 @@ ENV OSMPOL_SQL_DATABASE_URI sqlite:///mon_sqlite.db ENV OSMPOL_GLOBAL_LOG_LEVEL INFO +ENV OSMPOL_AUTOHEAL_ENABLED True + +ENV OSMPOL_AUTOSCALE_ENABLED True + HEALTHCHECK --start-period=120s --interval=10s --timeout=5s --retries=5 \ CMD osm-pol-healthcheck || exit 1