From: beierlm Date: Wed, 7 Apr 2021 09:25:10 +0000 (-0400) Subject: Pip Standardization Update X-Git-Tag: branch-sol006v331-start~19 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=b7608055809d664eed0ee804d74e1cb4903245e8;p=osm%2Fdevops.git Pip Standardization Update Adds mysqladmin to POL for startup Brings osm binary to final layer in tests Change-Id: I0418be0dc224fbd846a5ea694e9cf3e97ffc9954 Signed-off-by: beierlm --- diff --git a/docker/POL/Dockerfile b/docker/POL/Dockerfile index d6f460ba..6f02afe1 100644 --- a/docker/POL/Dockerfile +++ b/docker/POL/Dockerfile @@ -31,6 +31,9 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ python3-dev=3.8.2-0ubuntu2 && \ 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 diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile index 66da9faa..33dc63b0 100644 --- a/docker/tests/Dockerfile +++ b/docker/tests/Dockerfile @@ -62,6 +62,7 @@ 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.6/dist-packages /usr/local/lib/python3.6/dist-packages +COPY --from=INSTALL /usr/bin/osm /usr/bin/osm COPY --from=INSTALL /usr/share/osm-tests/robot-systest /robot-systest COPY --from=INSTALL /usr/share/osm-tests/charm.sh /usr/sbin/charm