From 55a9ad4590d0abff6f3c2328a711e5fa59410c18 Mon Sep 17 00:00:00 2001 From: beierlm Date: Wed, 7 Apr 2021 07:34:04 -0400 Subject: [PATCH] Pip standardization Bring forward all shared libraries for tests container Change-Id: I6388ede5461678fdefc9fe8fafa027db84747ed5 Signed-off-by: beierlm --- docker/tests/Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile index 33dc63b0..f4699adf 100644 --- a/docker/tests/Dockerfile +++ b/docker/tests/Dockerfile @@ -44,7 +44,6 @@ RUN dpkg -i ./osmclient.deb RUN curl $OSM_TESTS_URL -o osm_tests.deb RUN dpkg -i ./osm_tests.deb - RUN pip3 install \ -r /usr/lib/python3/dist-packages/osm_im/requirements.txt \ -r /usr/lib/python3/dist-packages/osmclient/requirements.txt \ @@ -60,6 +59,10 @@ FROM ubuntu:18.04 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.6.7-1~18.04 +COPY --from=INSTALL /usr/bin/ssh-keygen /usr/bin/ssh-keygen +COPY --from=INSTALL /usr/lib/x86_64-linux-gnu/ /usr/lib/x86_64-linux-gnu/ +COPY --from=INSTALL /lib/x86_64-linux-gnu/ /lib/x86_64-linux-gnu/ + 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 @@ -67,6 +70,7 @@ 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 COPY --from=INSTALL /robot-systest/osm-packages /robot-systest/osm-packages +COPY --from=INSTALL /usr/local/bin/robot /usr/local/bin/ WORKDIR /robot-systest -- 2.17.1