From 5efc158f2124af6cd8506af259166eadd7d4edd1 Mon Sep 17 00:00:00 2001 From: Muhammad Aqeel Date: Thu, 20 Jun 2024 10:38:59 +0000 Subject: [PATCH] Cherry-pick changes to v3 (#3031) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [PMM-12869]: Adds tar, curl and their dependent libraries to pmm-client image. * [PMM-12869]: Adds comments to explain purpose of lines below --------- Co-authored-by: Jiří Čtvrtka <62988319+JiriCtvrtka@users.noreply.github.com> --- build/docker/client/Dockerfile | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/build/docker/client/Dockerfile b/build/docker/client/Dockerfile index 2c03161268..a5d82c7165 100644 --- a/build/docker/client/Dockerfile +++ b/build/docker/client/Dockerfile @@ -1,6 +1,6 @@ FROM redhat/ubi9-minimal as users -RUN microdnf install shadow-utils jq -y +RUN microdnf install shadow-utils jq tar -y RUN groupadd -g 1002 pmm-agent && \ useradd -u 1002 -r -g pmm-agent -s /sbin/nologin \ @@ -24,9 +24,26 @@ COPY --from=users --chown=0:0 /etc/group /etc/group # Install jq along with its dependencies COPY --from=users --chown=0:0 /usr/bin/jq /usr/bin/ +COPY --from=users --chown=0:0 /usr/bin/tar /usr/bin/ +COPY --from=users --chown=0:0 /usr/bin/curl /usr/bin/ + COPY --from=users --chown=0:0 /usr/lib64/libjq.so.1.0.4 /lib64/libjq.so.1 COPY --from=users --chown=0:0 /usr/lib64/libonig.so.5.1.0 /lib64/libonig.so.5 +# Dependencies of curl +COPY --from=users --chown=0:0 /usr/lib64/libkeyutils.so* /lib64/ +COPY --from=users --chown=0:0 /usr/lib64/libz.so* /lib64/ +COPY --from=users --chown=0:0 /usr/lib64/libkrb5support.so* /lib64/ +COPY --from=users --chown=0:0 /usr/lib64/libkrb5.so* /lib64/ +COPY --from=users --chown=0:0 /usr/lib64/libk5crypto.so* /lib64/ +COPY --from=users --chown=0:0 /usr/lib64/libgssapi_krb5.so* /lib64/ +COPY --from=users --chown=0:0 /usr/lib64/libcom_err.so* /lib64/ +COPY --from=users --chown=0:0 /usr/lib64/libssl.so* /lib64/ +COPY --from=users --chown=0:0 /usr/lib64/libcrypto.so* /lib64/ +COPY --from=users --chown=0:0 /usr/lib64/libcurl.so* /lib64/ +COPY --from=users --chown=0:0 /usr/lib64/libnghttp2.so* /lib64/ +COPY --from=users --chown=0:0 /usr/lib64/libresolv.so* /lib64/ + RUN install -d -o pmm-agent -g pmm-agent -m 0775 /usr/local/percona/pmm ADD pmm-client.tar.gz /tmp/