Skip to content

Commit

Permalink
Cherry-pick changes to v3 (#3031)
Browse files Browse the repository at this point in the history
* [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 <[email protected]>
  • Loading branch information
maqeel75 and JiriCtvrtka authored Jun 20, 2024
1 parent cd40e7a commit 5efc158
Showing 1 changed file with 18 additions and 1 deletion.
19 changes: 18 additions & 1 deletion build/docker/client/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand All @@ -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/
Expand Down

0 comments on commit 5efc158

Please sign in to comment.