X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FPOL%2FDockerfile;h=990d325362263bef4d291f7b576afbde3b762fe7;hb=b89f26b8b330e5af11dc47c06c4e65cbbcd0a52b;hp=6f02afe1c53c7cddfe0bf0bc96ccf140dad57b26;hpb=b7608055809d664eed0ee804d74e1cb4903245e8;p=osm%2Fdevops.git diff --git a/docker/POL/Dockerfile b/docker/POL/Dockerfile index 6f02afe1..990d3253 100644 --- a/docker/POL/Dockerfile +++ b/docker/POL/Dockerfile @@ -24,16 +24,14 @@ 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.5 \ + curl=7.68.0-1ubuntu2.6 \ gcc=4:9.3.0-1ubuntu2 \ python3=3.8.2-0ubuntu2 \ python3-setuptools=45.2.0-1 \ - python3-dev=3.8.2-0ubuntu2 && \ + python3-dev=3.8.2-0ubuntu2 \ + mysql-client-core-8.0=8.0.26-0ubuntu0.20.04.2 && \ python3 -m easy_install pip==21.0.1 -RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \ - mysql-client-core-8.0=8.0.23-0ubuntu0.20.04.1 - ARG PYTHON3_OSM_COMMON_URL ARG PYTHON3_OSM_POLICY_MODULE_URL @@ -55,6 +53,11 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ 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/