X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FPOL%2FDockerfile;h=3e708b7392fae7e4672e8b2461d59ca3c8c2d13d;hb=847febf8619c2d3a3a66afef14fe794fdf02d8d5;hp=0c25583fef0cd11ef1a7b9cf6d669611e0a36fda;hpb=a60ec7310d582158700acf9f3fb1945cb05bacca;p=osm%2Fdevops.git diff --git a/docker/POL/Dockerfile b/docker/POL/Dockerfile index 0c25583f..3e708b73 100644 --- a/docker/POL/Dockerfile +++ b/docker/POL/Dockerfile @@ -24,12 +24,13 @@ FROM ubuntu:20.04 as INSTALL RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ DEBIAN_FRONTEND=noninteractive apt-get --yes install \ - curl=7.68.0-1ubuntu2.4 \ - gcc=4:9.3.0-1ubuntu2 \ - python3=3.8.2-0ubuntu2 \ - python3-setuptools=45.2.0-1 \ - python3-dev=3.8.2-0ubuntu2 && \ - python3 -m easy_install pip==21.0.1 + curl=7.68.* \ + gcc=4:9.3.* \ + python3=3.8.* \ + python3-setuptools=45.2.* \ + python3-dev=3.8.* \ + mysql-client-core-8.0=8.0.* && \ + python3 -m easy_install pip==21.0.1 setuptools==51.0.0 ARG PYTHON3_OSM_COMMON_URL ARG PYTHON3_OSM_POLICY_MODULE_URL @@ -47,11 +48,17 @@ RUN pip3 install \ FROM ubuntu:20.04 as FINAL RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ - DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.8.2-0ubuntu2 + DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.8.* \ + && rm -rf /var/lib/apt/lists/* 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/bin/osm* /usr/bin/ +COPY --from=INSTALL /usr/bin/mysql /usr/bin/ +COPY --from=INSTALL /usr/bin/mysqladmin /usr/bin/ +COPY --from=INSTALL /usr/bin/mysqlshow /usr/bin/ +COPY --from=INSTALL /usr/lib/x86_64-linux-gnu/libedit.so.2 /usr/lib/x86_64-linux-gnu/ +COPY --from=INSTALL /usr/lib/x86_64-linux-gnu/libbsd.so.0 /usr/lib/x86_64-linux-gnu/ COPY scripts/ scripts/