Pip Standardization Update

Adds mysqladmin to POL for startup
Brings osm binary to final layer in tests

Change-Id: I0418be0dc224fbd846a5ea694e9cf3e97ffc9954
Signed-off-by: beierlm <mark.beierl@canonical.com>

diff --git a/docker/POL/Dockerfile b/docker/POL/Dockerfile
index d6f460b..6f02afe 100644 (file)
--- 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 66da9fa..33dc63b 100644 (file)
--- 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