From 023e83c1369b6b67c03063a3eab0fb68909552fa Mon Sep 17 00:00:00 2001 From: beierlm Date: Wed, 14 Apr 2021 10:12:58 -0400 Subject: [PATCH] Add missing software layers Adds openssh to MON Adds mysqladmin to POL Adds envsubst to tests Fixes bug 1503 Change-Id: Ieafee31695bfc6ccecb1f1bcf52b57e91a45686e Signed-off-by: beierlm --- docker/MON/Dockerfile | 11 +++++++++++ docker/POL/Dockerfile | 1 + docker/tests/Dockerfile | 1 + 3 files changed, 13 insertions(+) diff --git a/docker/MON/Dockerfile b/docker/MON/Dockerfile index 1f6ecf4d..d7ae32d5 100644 --- a/docker/MON/Dockerfile +++ b/docker/MON/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 \ + openssh-client=1:8.2p1-4ubuntu0.2 + ARG PYTHON3_OSM_COMMON_URL ARG PYTHON3_OSM_MON_URL ARG PYTHON3_N2VC_URL @@ -54,9 +57,17 @@ 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 +RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \ + ca-certificates + 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/scp /usr/bin/scp +COPY --from=INSTALL /usr/bin/ssh-keygen /usr/bin/ssh-keygen +COPY --from=INSTALL /usr/bin/ssh /usr/bin/ssh +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 scripts/ scripts/ diff --git a/docker/POL/Dockerfile b/docker/POL/Dockerfile index 6f02afe1..c50cd10f 100644 --- a/docker/POL/Dockerfile +++ b/docker/POL/Dockerfile @@ -55,6 +55,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.8/dist-packages /usr/local/lib/python3.8/dist-packages COPY --from=INSTALL /usr/bin/osm* /usr/bin/ +COPY --from=INSTALL /usr/bin/mysqladmin /usr/bin/ COPY scripts/ scripts/ diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile index a0cc7f80..f191ddf2 100644 --- a/docker/tests/Dockerfile +++ b/docker/tests/Dockerfile @@ -27,6 +27,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ python3 -m easy_install pip==21.0.1 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \ + gettext-base \ git=1:2.17.1-1ubuntu0.8 \ jq=1.5+dfsg-2 \ libcurl4-openssl-dev=7.58.0-2ubuntu3.13 \ -- 2.17.1