From fc988990cd0eb8293c429e41499fbe0398c0d808 Mon Sep 17 00:00:00 2001 From: Muhammad Aqeel Date: Fri, 13 Dec 2024 18:49:55 +0500 Subject: [PATCH] Install socat and oniguruma from appstream repo --- percona-xtradb-cluster-5.7/Dockerfile | 10 +++++----- percona-xtradb-cluster-5.7/Dockerfile.k8s | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/percona-xtradb-cluster-5.7/Dockerfile b/percona-xtradb-cluster-5.7/Dockerfile index e6d4f170..36e6c8bc 100644 --- a/percona-xtradb-cluster-5.7/Dockerfile +++ b/percona-xtradb-cluster-5.7/Dockerfile @@ -46,17 +46,17 @@ RUN set -ex; \ curl -Lf -o /tmp/numactl-libs.rpm https://downloads.percona.com/downloads/packaging/numactl-libs-2.0.18-2.el9.x86_64.rpm; \ curl -Lf -o /tmp/libev.rpm https://downloads.percona.com/downloads/packaging/libev-4.33-5.el9.x86_64.rpm; \ curl -Lf -o /tmp/jq.rpm https://mirror.stream.centos.org/9-stream/AppStream/x86_64/os/Packages/jq-1.6-14.el9.x86_64.rpm; \ - curl -Lf -o /tmp/oniguruma.rpm https://downloads.percona.com/downloads/packaging/oniguruma-6.9.6-1.el9.6.x86_64.rpm; \ curl -Lf -o /tmp/pv.rpm http://download.fedoraproject.org/pub/epel/9/Everything/x86_64/Packages/p/pv-1.6.20-1.el9.x86_64.rpm; \ - curl -Lf -o /tmp/socat.rpm https://downloads.percona.com/downloads/packaging/socat-1.7.4.1-6.el9.x86_64.rpm; \ - rpmkeys --checksig /tmp/socat.rpm /tmp/numactl-libs.rpm /tmp/libev.rpm /tmp/jq.rpm /tmp/oniguruma.rpm /tmp/pv.rpm; \ - rpm -i /tmp/socat.rpm /tmp/numactl-libs.rpm /tmp/libev.rpm /tmp/jq.rpm /tmp/oniguruma.rpm /tmp/pv.rpm; \ - rm -rf /tmp/socat.rpm /tmp/numactl-libs.rpm /tmp/libev.rpm /tmp/jq.rpm /tmp/oniguruma.rpm /tmp/pv.rpm + rpmkeys --checksig /tmp/numactl-libs.rpm /tmp/libev.rpm /tmp/jq.rpm /tmp/pv.rpm; \ + rpm -i /tmp/numactl-libs.rpm /tmp/libev.rpm /tmp/jq.rpm /tmp/pv.rpm; \ + rm -rf /tmp/numactl-libs.rpm /tmp/libev.rpm /tmp/jq.rpm /tmp/pv.rpm RUN set -ex; \ rpm -e --nodeps tzdata; \ microdnf --setopt=install_weak_deps=0 --best install -y \ openssl \ + socat \ + oniguruma \ shadow-utils \ hostname \ tzdata \ diff --git a/percona-xtradb-cluster-5.7/Dockerfile.k8s b/percona-xtradb-cluster-5.7/Dockerfile.k8s index 8a5c58d2..765328db 100644 --- a/percona-xtradb-cluster-5.7/Dockerfile.k8s +++ b/percona-xtradb-cluster-5.7/Dockerfile.k8s @@ -62,19 +62,19 @@ RUN set -ex; \ curl -Lf -o /tmp/numactl-libs.rpm https://downloads.percona.com/downloads/packaging/numactl-libs-2.0.18-2.el9.x86_64.rpm; \ curl -Lf -o /tmp/libev.rpm https://downloads.percona.com/downloads/packaging/libev-4.33-5.el9.x86_64.rpm; \ curl -Lf -o /tmp/jq.rpm https://mirror.stream.centos.org/9-stream/AppStream/x86_64/os/Packages/jq-1.6-14.el9.x86_64.rpm; \ - curl -Lf -o /tmp/oniguruma.rpm https://downloads.percona.com/downloads/packaging/oniguruma-6.9.6-1.el9.6.x86_64.rpm; \ curl -Lf -o /tmp/pv.rpm http://download.fedoraproject.org/pub/epel/9/Everything/x86_64/Packages/p/pv-1.6.20-1.el9.x86_64.rpm; \ - curl -Lf -o /tmp/socat.rpm https://downloads.percona.com/downloads/packaging/socat-1.7.4.1-6.el9.x86_64.rpm; \ curl -Lf -o /tmp/compat-openssl.rpm https://downloads.percona.com/downloads/packaging/compat-openssl11-1.1.1k-4.el9_0.x86_64.rpm; \ - rpmkeys --checksig /tmp/socat.rpm /tmp/numactl-libs.rpm /tmp/libev.rpm /tmp/jq.rpm /tmp/oniguruma.rpm /tmp/pv.rpm /tmp/compat-openssl.rpm; \ + rpmkeys --checksig /tmp/numactl-libs.rpm /tmp/libev.rpm /tmp/jq.rpm /tmp/pv.rpm /tmp/compat-openssl.rpm; \ rpm -i /tmp/compat-openssl.rpm --nodeps; \ - rpm -i /tmp/socat.rpm /tmp/numactl-libs.rpm /tmp/libev.rpm /tmp/jq.rpm /tmp/oniguruma.rpm /tmp/pv.rpm; \ - rm -rf /tmp/socat.rpm /tmp/numactl-libs.rpm /tmp/libev.rpm /tmp/jq.rpm /tmp/oniguruma.rpm /tmp/pv.rpm /tmp/compat-openssl.rpm + rpm -i /tmp/numactl-libs.rpm /tmp/libev.rpm /tmp/jq.rpm /tmp/pv.rpm; \ + rm -rf /tmp/numactl-libs.rpm /tmp/libev.rpm /tmp/jq.rpm /tmp/pv.rpm /tmp/compat-openssl.rpm RUN set -ex; \ rpm -e --nodeps tzdata; \ microdnf install -y \ openssl \ + socat \ + oniguruma \ procps-ng \ shadow-utils \ hostname \