diff --git a/percona-server-mongodb-6.0/Dockerfile b/percona-server-mongodb-6.0/Dockerfile index bacf4dda..f6491c3f 100644 --- a/percona-server-mongodb-6.0/Dockerfile +++ b/percona-server-mongodb-6.0/Dockerfile @@ -1,23 +1,25 @@ -FROM oraclelinux:8 +FROM redhat/ubi9-minimal LABEL org.opencontainers.image.authors="info@percona.com" # check repository package signature in secure way RUN set -ex; \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 4D1BB29D63D98E422B2113B19334A25F8507EFA5 99DB70FAE1D7CE227FB6488205B555B38483C65D 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1; \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 4D1BB29D63D98E422B2113B19334A25F8507EFA5 99DB70FAE1D7CE227FB6488205B555B38483C65D 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 3E6D826D3FBAB389C2F38E34BC4D06A08D8B756F; \ gpg --batch --export --armor 4D1BB29D63D98E422B2113B19334A25F8507EFA5 > ${GNUPGHOME}/PERCONA-PACKAGING-KEY; \ gpg --batch --export --armor 99DB70FAE1D7CE227FB6488205B555B38483C65D > ${GNUPGHOME}/RPM-GPG-KEY-centosofficial; \ - gpg --batch --export --armor 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 > ${GNUPGHOME}/RPM-GPG-KEY-EPEL-8; \ - rpmkeys --import ${GNUPGHOME}/PERCONA-PACKAGING-KEY ${GNUPGHOME}/RPM-GPG-KEY-centosofficial ${GNUPGHOME}/RPM-GPG-KEY-EPEL-8; \ + gpg --batch --export --armor 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 > ${GNUPGHOME}/RPM-GPG-KEY-EPEL-9; \ + gpg --batch --export --armor 3E6D826D3FBAB389C2F38E34BC4D06A08D8B756F > ${GNUPGHOME}/RPM-GPG-KEY-oracle; \ + rpmkeys --import ${GNUPGHOME}/PERCONA-PACKAGING-KEY ${GNUPGHOME}/RPM-GPG-KEY-centosofficial ${GNUPGHOME}/RPM-GPG-KEY-EPEL-9 ${GNUPGHOME}/RPM-GPG-KEY-oracle; \ curl -Lf -o /tmp/percona-release.rpm https://repo.percona.com/yum/percona-release-latest.noarch.rpm; \ rpmkeys --checksig /tmp/percona-release.rpm; \ + microdnf install -y findutils; \ rpm -i /tmp/percona-release.rpm; \ rm -rf "$GNUPGHOME" /tmp/percona-release.rpm; \ rpm --import /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY ENV PSMDB_VERSION 6.0.19-16 -ENV OS_VER el8 +ENV OS_VER el9 ENV FULL_PERCONA_VERSION "$PSMDB_VERSION.$OS_VER" ENV K8S_TOOLS_VERSION "0.5.0" ENV PSMDB_REPO release @@ -28,16 +30,16 @@ ARG PERCONA_TELEMETRY_DISABLE=1 RUN set -ex; \ percona-release enable psmdb-60 ${PSMDB_REPO}; \ percona-release enable telemetry ${PSMDB_REPO}; \ - dnf config-manager --enable ol8_u4_security_validation; \ - dnf -y update openssh; \ - dnf -y update bind-export-libs; \ - dnf -y update glibc; \ - dnf -y update libgcrypt; \ - dnf -y install \ + #microdnf config-manager --enable ol8_u4_security_validation; \ + microdnf -y update openssh; \ + #miicrodnf -y update bind-export-libs; \ + #microdnf -y update glibc; \ + microdnf -y update libgcrypt; \ + microdnf -y install \ percona-server-mongodb-mongos-${FULL_PERCONA_VERSION} \ percona-server-mongodb-tools-${FULL_PERCONA_VERSION} \ percona-mongodb-mongosh \ - numactl \ + numactl-libs \ procps-ng \ jq \ tar \ @@ -45,11 +47,14 @@ RUN set -ex; \ cyrus-sasl-gssapi \ policycoreutils; \ \ - curl -Lf -o /tmp/Percona-Server-MongoDB-server.rpm http://repo.percona.com/psmdb-60/yum/${PSMDB_REPO}/8/RPMS/x86_64/percona-server-mongodb-server-${FULL_PERCONA_VERSION}.x86_64.rpm; \ + curl -Lf -o /tmp/Percona-Server-MongoDB-server.rpm http://repo.percona.com/psmdb-60/yum/${PSMDB_REPO}/9/RPMS/x86_64/percona-server-mongodb-server-${FULL_PERCONA_VERSION}.x86_64.rpm; \ + curl -Lf -o /tmp/numactl.rpm https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/x86_64/getPackage/numactl-2.0.16-1.el9.x86_64.rpm; \ + rpmkeys --checksig /tmp/numactl.rpm; \ rpmkeys --checksig /tmp/Percona-Server-MongoDB-server.rpm; \ rpm -iv /tmp/Percona-Server-MongoDB-server.rpm --nodeps; \ - rm -rf /tmp/Percona-Server-MongoDB-server.rpm; \ - dnf clean all; \ + rpm -i /tmp/numactl.rpm; \ + rm -rf /tmp/numactl.rpm /tmp/Percona-Server-MongoDB-server.rpm; \ + microdnf clean all; \ rm -rf /var/cache/dnf /var/cache/yum /data/db && mkdir -p /data/db; \ chown -R 1001:0 /data/db diff --git a/percona-server-mongodb-6.0/Dockerfile-dockerhub b/percona-server-mongodb-6.0/Dockerfile-dockerhub index 8abf6b5d..cd95455b 100644 --- a/percona-server-mongodb-6.0/Dockerfile-dockerhub +++ b/percona-server-mongodb-6.0/Dockerfile-dockerhub @@ -1,24 +1,26 @@ # This Dockerfile should be used for docker official repo -FROM oraclelinux:8 +FROM redhat/ubi9-minimal LABEL org.opencontainers.image.authors="info@percona.com" # check repository package signature in secure way RUN set -ex; \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 4D1BB29D63D98E422B2113B19334A25F8507EFA5 99DB70FAE1D7CE227FB6488205B555B38483C65D 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1; \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 4D1BB29D63D98E422B2113B19334A25F8507EFA5 99DB70FAE1D7CE227FB6488205B555B38483C65D 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 3E6D826D3FBAB389C2F38E34BC4D06A08D8B756F; \ gpg --batch --export --armor 4D1BB29D63D98E422B2113B19334A25F8507EFA5 > ${GNUPGHOME}/PERCONA-PACKAGING-KEY; \ gpg --batch --export --armor 99DB70FAE1D7CE227FB6488205B555B38483C65D > ${GNUPGHOME}/RPM-GPG-KEY-centosofficial; \ - gpg --batch --export --armor 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 > ${GNUPGHOME}/RPM-GPG-KEY-EPEL-8; \ - rpmkeys --import ${GNUPGHOME}/PERCONA-PACKAGING-KEY ${GNUPGHOME}/RPM-GPG-KEY-centosofficial ${GNUPGHOME}/RPM-GPG-KEY-EPEL-8; \ + gpg --batch --export --armor 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 > ${GNUPGHOME}/RPM-GPG-KEY-EPEL-9; \ + gpg --batch --export --armor 3E6D826D3FBAB389C2F38E34BC4D06A08D8B756F > ${GNUPGHOME}/RPM-GPG-KEY-oracle; \ + rpmkeys --import ${GNUPGHOME}/PERCONA-PACKAGING-KEY ${GNUPGHOME}/RPM-GPG-KEY-centosofficial ${GNUPGHOME}/RPM-GPG-KEY-EPEL-9 ${GNUPGHOME}/RPM-GPG-KEY-oracle; \ curl -Lf -o /tmp/percona-release.rpm https://repo.percona.com/yum/percona-release-latest.noarch.rpm; \ rpmkeys --checksig /tmp/percona-release.rpm; \ + microdnf install -y findutils; \ rpm -i /tmp/percona-release.rpm; \ rm -rf "$GNUPGHOME" /tmp/percona-release.rpm; \ rpm --import /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY ENV PSMDB_VERSION 6.0.19-16 -ENV OS_VER el8 +ENV OS_VER el9 ENV FULL_PERCONA_VERSION "$PSMDB_VERSION.$OS_VER" ENV K8S_TOOLS_VERSION "0.5.0" ENV PSMDB_REPO release @@ -30,16 +32,16 @@ ARG PERCONA_TELEMETRY_DISABLE=1 RUN set -ex; \ percona-release enable psmdb-60 ${PSMDB_REPO}; \ - dnf config-manager --enable ol8_u4_security_validation; \ - dnf -y update openssh; \ - dnf -y update bind-export-libs; \ - dnf -y update glibc; \ - dnf -y update libgcrypt; \ - dnf -y install \ + #microdnf config-manager --enable ol8_u4_security_validation; \ + microdnf -y update openssh; \ + #microdnf -y update bind-export-libs; \ + #microdnf -y update glibc; \ + microdnf -y update libgcrypt; \ + microdnf -y install \ percona-server-mongodb-mongos-${FULL_PERCONA_VERSION} \ percona-server-mongodb-tools-${FULL_PERCONA_VERSION} \ percona-mongodb-mongosh \ - numactl \ + numactl-libs \ procps-ng \ jq \ tar \ @@ -47,11 +49,14 @@ RUN set -ex; \ cyrus-sasl-gssapi \ policycoreutils; \ \ - curl -Lf -o /tmp/Percona-Server-MongoDB-server.rpm http://repo.percona.com/psmdb-60/yum/${PSMDB_REPO}/8/RPMS/x86_64/percona-server-mongodb-server-${FULL_PERCONA_VERSION}.x86_64.rpm; \ + curl -Lf -o /tmp/Percona-Server-MongoDB-server.rpm http://repo.percona.com/psmdb-60/yum/${PSMDB_REPO}/9/RPMS/x86_64/percona-server-mongodb-server-${FULL_PERCONA_VERSION}.x86_64.rpm; \ + curl -Lf -o /tmp/numactl.rpm https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/x86_64/getPackage/numactl-2.0.16-1.el9.x86_64.rpm; \ + rpmkeys --checksig /tmp/numactl.rpm; \ rpmkeys --checksig /tmp/Percona-Server-MongoDB-server.rpm; \ rpm -iv /tmp/Percona-Server-MongoDB-server.rpm --nodeps; \ - rm -rf /tmp/Percona-Server-MongoDB-server.rpm; \ - dnf clean all; \ + rpm -i /tmp/numactl.rpm; \ + rm -rf /tmp/numactl.rpm /tmp/Percona-Server-MongoDB-server.rpm; \ + microdnf clean all; \ rm -rf /var/cache/dnf /var/cache/yum /data/db && mkdir -p /data/db; \ chown -R 1001:0 /data/db diff --git a/percona-server-mongodb-6.0/Dockerfile.aarch64 b/percona-server-mongodb-6.0/Dockerfile.aarch64 index 9fa20899..d12ada50 100644 --- a/percona-server-mongodb-6.0/Dockerfile.aarch64 +++ b/percona-server-mongodb-6.0/Dockerfile.aarch64 @@ -1,26 +1,28 @@ -FROM oraclelinux:8 +FROM redhat/ubi9-minimal LABEL org.opencontainers.image.authors="info@percona.com" # check repository package signature in secure way RUN set -ex; \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 4D1BB29D63D98E422B2113B19334A25F8507EFA5 99DB70FAE1D7CE227FB6488205B555B38483C65D 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1; \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 4D1BB29D63D98E422B2113B19334A25F8507EFA5 99DB70FAE1D7CE227FB6488205B555B38483C65D 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 3E6D826D3FBAB389C2F38E34BC4D06A08D8B756F; \ gpg --batch --export --armor 4D1BB29D63D98E422B2113B19334A25F8507EFA5 > ${GNUPGHOME}/PERCONA-PACKAGING-KEY; \ gpg --batch --export --armor 99DB70FAE1D7CE227FB6488205B555B38483C65D > ${GNUPGHOME}/RPM-GPG-KEY-centosofficial; \ - gpg --batch --export --armor 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 > ${GNUPGHOME}/RPM-GPG-KEY-EPEL-8; \ - rpmkeys --import ${GNUPGHOME}/PERCONA-PACKAGING-KEY ${GNUPGHOME}/RPM-GPG-KEY-centosofficial ${GNUPGHOME}/RPM-GPG-KEY-EPEL-8; \ + gpg --batch --export --armor 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 > ${GNUPGHOME}/RPM-GPG-KEY-EPEL-9; \ + gpg --batch --export --armor 3E6D826D3FBAB389C2F38E34BC4D06A08D8B756F > ${GNUPGHOME}/RPM-GPG-KEY-oracle; \ + rpmkeys --import ${GNUPGHOME}/PERCONA-PACKAGING-KEY ${GNUPGHOME}/RPM-GPG-KEY-centosofficial ${GNUPGHOME}/RPM-GPG-KEY-EPEL-9 ${GNUPGHOME}/RPM-GPG-KEY-oracle; \ curl -Lf -o /tmp/percona-release.rpm https://repo.percona.com/yum/percona-release-latest.noarch.rpm; \ rpmkeys --checksig /tmp/percona-release.rpm; \ + microdnf install -y findutils; \ rpm -i /tmp/percona-release.rpm; \ rm -rf "$GNUPGHOME" /tmp/percona-release.rpm; \ rpm --import /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY ENV PSMDB_VERSION 6.0.19-16 -ENV OS_VER el8 +ENV OS_VER el9 ENV FULL_PERCONA_VERSION "$PSMDB_VERSION.$OS_VER" ENV K8S_TOOLS_VERSION "0.5.0" -ENV PSMDB_REPO experimental +ENV PSMDB_REPO testing # Do not report during Docker image creation. ARG PERCONA_TELEMETRY_DISABLE=1 @@ -29,16 +31,16 @@ RUN set -ex; \ sed -i "s|x86_64|x86_64 aarch64|" /usr/bin/percona-release; \ percona-release enable psmdb-60 ${PSMDB_REPO}; \ percona-release enable telemetry ${PSMDB_REPO}; \ - dnf config-manager --enable ol8_u4_security_validation; \ - dnf -y update openssh; \ - dnf -y update bind-export-libs; \ - dnf -y update glibc; \ - dnf -y update libgcrypt; \ - dnf -y install \ + #microdnf config-manager --enable ol8_u4_security_validation; \ + microdnf -y update openssh; \ + #microdnf -y update bind-export-libs; \ + #microdnf -y update glibc; \ + microdnf -y update libgcrypt; \ + microdnf -y install \ percona-server-mongodb-mongos-${FULL_PERCONA_VERSION} \ percona-server-mongodb-tools-${FULL_PERCONA_VERSION} \ percona-mongodb-mongosh \ - numactl \ + numactl-libs \ procps-ng \ jq \ tar \ @@ -47,11 +49,14 @@ RUN set -ex; \ policycoreutils; \ \ ARCH="$(uname -m)"; \ - curl -Lf -o /tmp/Percona-Server-MongoDB-server.rpm http://repo.percona.com/psmdb-60/yum/${PSMDB_REPO}/8/RPMS/${ARCH}/percona-server-mongodb-server-${FULL_PERCONA_VERSION}.${ARCH}.rpm; \ + curl -Lf -o /tmp/Percona-Server-MongoDB-server.rpm http://repo.percona.com/psmdb-60/yum/${PSMDB_REPO}/9/RPMS/${ARCH}/percona-server-mongodb-server-${FULL_PERCONA_VERSION}.${ARCH}.rpm; \ + curl -Lf -o /tmp/numactl.rpm https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/${ARCH}/getPackage/numactl-2.0.18-2.${OS_VER}.${ARCH}.rpm; \ + rpmkeys --checksig /tmp/numactl.rpm; \ rpmkeys --checksig /tmp/Percona-Server-MongoDB-server.rpm; \ rpm -iv /tmp/Percona-Server-MongoDB-server.rpm --nodeps; \ - rm -rf /tmp/Percona-Server-MongoDB-server.rpm; \ - dnf clean all; \ + rpm -i /tmp/numactl.rpm; \ + rm -rf /tmp/numactl.rpm /tmp/Percona-Server-MongoDB-server.rpm; \ + microdnf clean all; \ rm -rf /var/cache/dnf /var/cache/yum /data/db && mkdir -p /data/db; \ chown -R 1001:0 /data/db diff --git a/percona-server-mongodb-6.0/Dockerfile.debug b/percona-server-mongodb-6.0/Dockerfile.debug index aba71596..46679100 100644 --- a/percona-server-mongodb-6.0/Dockerfile.debug +++ b/percona-server-mongodb-6.0/Dockerfile.debug @@ -28,7 +28,7 @@ USER 0 RUN set -ex; \ sed -i 's/exec "$@"/exec "$@" -vvv || sleep infinity/' /entrypoint.sh; \ - dnf -y install \ + microdnf -y install \ net-tools \ gdb \ nc \ @@ -40,7 +40,7 @@ RUN set -ex; \ percona-server-mongodb-mongos-debuginfo-${FULL_PERCONA_VERSION} \ percona-server-mongodb-debugsource-${FULL_PERCONA_VERSION} \ percona-server-mongodb-tools-${FULL_PERCONA_VERSION}; \ - dnf clean all; \ + microdnf clean all; \ rm -rf /var/cache/dnf /var/cache/yum ADD https://raw.githubusercontent.com/Percona-Lab/telemetry-agent/phase-0/call-home.sh /call-home.sh diff --git a/percona-server-mongodb-6.0/Dockerfile.k8s b/percona-server-mongodb-6.0/Dockerfile.k8s index 52b6e172..0594cee2 100644 --- a/percona-server-mongodb-6.0/Dockerfile.k8s +++ b/percona-server-mongodb-6.0/Dockerfile.k8s @@ -1,4 +1,4 @@ -FROM redhat/ubi8-minimal +FROM redhat/ubi9-minimal # Please don't remove old-style LABEL since it's needed for RedHat certification LABEL name="Percona Server for MongoDB" \ @@ -19,7 +19,7 @@ LABEL org.opencontainers.image.license="SSPLv1" LABEL org.opencontainers.image.authors="info@percona.com" ENV PSMDB_VERSION 6.0.19-16 -ENV OS_VER el8 +ENV OS_VER el9 ENV FULL_PERCONA_VERSION "$PSMDB_VERSION.$OS_VER" ENV K8S_TOOLS_VERSION "0.5.0" ENV PSMDB_REPO release @@ -32,12 +32,12 @@ ARG PERCONA_TELEMETRY_DISABLE=1 # check repository package signature in secure way RUN set -ex; \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 4D1BB29D63D98E422B2113B19334A25F8507EFA5 99DB70FAE1D7CE227FB6488205B555B38483C65D 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 76FD3DB13AB67410B89DB10E82562EA9AD986DA3; \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 4D1BB29D63D98E422B2113B19334A25F8507EFA5 99DB70FAE1D7CE227FB6488205B555B38483C65D 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 3E6D826D3FBAB389C2F38E34BC4D06A08D8B756F; \ gpg --batch --export --armor 4D1BB29D63D98E422B2113B19334A25F8507EFA5 > ${GNUPGHOME}/PERCONA-PACKAGING-KEY; \ gpg --batch --export --armor 99DB70FAE1D7CE227FB6488205B555B38483C65D > ${GNUPGHOME}/RPM-GPG-KEY-centosofficial; \ - gpg --batch --export --armor 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 > ${GNUPGHOME}/RPM-GPG-KEY-EPEL-8; \ - gpg --batch --export --armor 76FD3DB13AB67410B89DB10E82562EA9AD986DA3 > ${GNUPGHOME}/RPM-GPG-KEY-oracle; \ - rpmkeys --import ${GNUPGHOME}/PERCONA-PACKAGING-KEY ${GNUPGHOME}/RPM-GPG-KEY-centosofficial ${GNUPGHOME}/RPM-GPG-KEY-EPEL-8 ${GNUPGHOME}/RPM-GPG-KEY-oracle; \ + gpg --batch --export --armor 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 > ${GNUPGHOME}/RPM-GPG-KEY-EPEL-9; \ + gpg --batch --export --armor 3E6D826D3FBAB389C2F38E34BC4D06A08D8B756F > ${GNUPGHOME}/RPM-GPG-KEY-oracle; \ + rpmkeys --import ${GNUPGHOME}/PERCONA-PACKAGING-KEY ${GNUPGHOME}/RPM-GPG-KEY-centosofficial ${GNUPGHOME}/RPM-GPG-KEY-EPEL-9 ${GNUPGHOME}/RPM-GPG-KEY-oracle; \ microdnf install -y findutils; \ curl -Lf -o /tmp/percona-release.rpm https://repo.percona.com/yum/percona-release-latest.noarch.rpm; \ rpmkeys --checksig /tmp/percona-release.rpm; \ @@ -46,14 +46,6 @@ RUN set -ex; \ rpm --import /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY; \ percona-release enable psmdb-60 ${PSMDB_REPO} -RUN set -ex; \ - curl -Lf -o /tmp/jq.rpm http://vault.centos.org/centos/8/AppStream/x86_64/os/Packages/jq-1.5-12.el8.x86_64.rpm; \ - curl -Lf -o /tmp/oniguruma.rpm http://vault.centos.org/centos/8/AppStream/x86_64/os/Packages/oniguruma-6.8.2-2.el8.x86_64.rpm; \ - rpmkeys --checksig /tmp/jq.rpm /tmp/oniguruma.rpm; \ - \ - rpm -i /tmp/jq.rpm /tmp/oniguruma.rpm; \ - rm -rf /tmp/jq.rpm /tmp/oniguruma.rpm - RUN set -ex; \ microdnf install -y \ percona-server-mongodb-mongos-${FULL_PERCONA_VERSION} \ @@ -61,14 +53,15 @@ RUN set -ex; \ percona-mongodb-mongosh \ numactl-libs \ shadow-utils \ - curl \ tar \ + jq \ + oniguruma \ procps-ng \ cyrus-sasl-gssapi \ policycoreutils; \ \ - curl -Lf -o /tmp/Percona-Server-MongoDB-server.rpm http://repo.percona.com/psmdb-60/yum/${PSMDB_REPO}/8/RPMS/x86_64/percona-server-mongodb-server-${FULL_PERCONA_VERSION}.x86_64.rpm; \ - curl -Lf -o /tmp/numactl.rpm https://yum.oracle.com/repo/OracleLinux/OL8/baseos/latest/x86_64/getPackage/numactl-2.0.12-11.el8.x86_64.rpm; \ + curl -Lf -o /tmp/Percona-Server-MongoDB-server.rpm http://repo.percona.com/psmdb-60/yum/${PSMDB_REPO}/9/RPMS/x86_64/percona-server-mongodb-server-${FULL_PERCONA_VERSION}.x86_64.rpm; \ + curl -Lf -o /tmp/numactl.rpm https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/x86_64/getPackage/numactl-2.0.16-1.el9.x86_64.rpm; \ rpmkeys --checksig /tmp/numactl.rpm /tmp/Percona-Server-MongoDB-server.rpm; \ rpm -iv /tmp/Percona-Server-MongoDB-server.rpm --nodeps; \ rpm -i /tmp/numactl.rpm; \ diff --git a/percona-server-mongodb-7.0/Dockerfile b/percona-server-mongodb-7.0/Dockerfile index 7c6b4a15..15b3c29b 100644 --- a/percona-server-mongodb-7.0/Dockerfile +++ b/percona-server-mongodb-7.0/Dockerfile @@ -1,4 +1,4 @@ -FROM oraclelinux:8 +FROM redhat/ubi9-minimal LABEL org.opencontainers.image.authors="info@percona.com" @@ -8,16 +8,17 @@ RUN set -ex; \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 4D1BB29D63D98E422B2113B19334A25F8507EFA5 99DB70FAE1D7CE227FB6488205B555B38483C65D 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1; \ gpg --batch --export --armor 4D1BB29D63D98E422B2113B19334A25F8507EFA5 > ${GNUPGHOME}/PERCONA-PACKAGING-KEY; \ gpg --batch --export --armor 99DB70FAE1D7CE227FB6488205B555B38483C65D > ${GNUPGHOME}/RPM-GPG-KEY-centosofficial; \ - gpg --batch --export --armor 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 > ${GNUPGHOME}/RPM-GPG-KEY-EPEL-8; \ - rpmkeys --import ${GNUPGHOME}/PERCONA-PACKAGING-KEY ${GNUPGHOME}/RPM-GPG-KEY-centosofficial ${GNUPGHOME}/RPM-GPG-KEY-EPEL-8; \ + gpg --batch --export --armor 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 > ${GNUPGHOME}/RPM-GPG-KEY-EPEL-9; \ + rpmkeys --import ${GNUPGHOME}/PERCONA-PACKAGING-KEY ${GNUPGHOME}/RPM-GPG-KEY-centosofficial ${GNUPGHOME}/RPM-GPG-KEY-EPEL-9; \ curl -Lf -o /tmp/percona-release.rpm https://repo.percona.com/yum/percona-release-latest.noarch.rpm; \ rpmkeys --checksig /tmp/percona-release.rpm; \ + microdnf install -y findutils; \ rpm -i /tmp/percona-release.rpm; \ rm -rf "$GNUPGHOME" /tmp/percona-release.rpm; \ rpm --import /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY ENV PSMDB_VERSION 7.0.15-9 -ENV OS_VER el8 +ENV OS_VER el9 ENV FULL_PERCONA_VERSION "$PSMDB_VERSION.$OS_VER" ENV K8S_TOOLS_VERSION "0.5.0" ENV PSMDB_REPO release @@ -28,16 +29,16 @@ ARG PERCONA_TELEMETRY_DISABLE=1 RUN set -ex; \ percona-release enable psmdb-70 ${PSMDB_REPO}; \ percona-release enable telemetry ${PSMDB_REPO}; \ - dnf config-manager --enable ol8_u4_security_validation; \ - dnf -y update openssh; \ - dnf -y update bind-export-libs; \ - dnf -y update glibc; \ - dnf -y update libgcrypt; \ - dnf -y install \ + #microdnf config-manager --enable ol9_u4_security_validation; \ + microdnf -y update openssh; \ + #microdnf -y update bind-export-libs; \ + microdnf -y update glibc; \ + microdnf -y update libgcrypt; \ + microdnf -y install \ percona-server-mongodb-mongos-${FULL_PERCONA_VERSION} \ percona-server-mongodb-tools-${FULL_PERCONA_VERSION} \ percona-mongodb-mongosh \ - numactl \ + numactl-libs \ procps-ng \ jq \ tar \ @@ -45,11 +46,16 @@ RUN set -ex; \ cyrus-sasl-gssapi \ policycoreutils; \ \ - curl -Lf -o /tmp/Percona-Server-MongoDB-server.rpm http://repo.percona.com/psmdb-70/yum/${PSMDB_REPO}/8/RPMS/x86_64/percona-server-mongodb-server-${FULL_PERCONA_VERSION}.x86_64.rpm; \ + curl -O https://download.rockylinux.org/pub/rocky/RPM-GPG-KEY-Rocky-9; \ + rpm --import RPM-GPG-KEY-Rocky-9; \ + curl -Lf -o /tmp/Percona-Server-MongoDB-server.rpm http://repo.percona.com/psmdb-70/yum/${PSMDB_REPO}/9/RPMS/x86_64/percona-server-mongodb-server-${FULL_PERCONA_VERSION}.x86_64.rpm; \ + curl -Lf -o /tmp/numactl.rpm https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/Packages/n/numactl-2.0.18-2.${OS_VER}.x86_64.rpm; \ + rpmkeys --checksig /tmp/numactl.rpm; \ rpmkeys --checksig /tmp/Percona-Server-MongoDB-server.rpm; \ rpm -iv /tmp/Percona-Server-MongoDB-server.rpm --nodeps; \ - rm -rf /tmp/Percona-Server-MongoDB-server.rpm; \ - dnf clean all; \ + rpm -i /tmp/numactl.rpm; \ + rm -rf /tmp/numactl.rpm /tmp/Percona-Server-MongoDB-server.rpm; \ + microdnf clean all; \ rm -rf /var/cache/dnf /var/cache/yum /data/db && mkdir -p /data/db; \ chown -R 1001:0 /data/db diff --git a/percona-server-mongodb-7.0/Dockerfile-dockerhub b/percona-server-mongodb-7.0/Dockerfile-dockerhub index 696aed0e..5bdb7c9a 100644 --- a/percona-server-mongodb-7.0/Dockerfile-dockerhub +++ b/percona-server-mongodb-7.0/Dockerfile-dockerhub @@ -1,5 +1,5 @@ # This Dockerfile should be used for docker official repo -FROM oraclelinux:8 +FROM redhat/ubi9-minimal LABEL org.opencontainers.image.authors="info@percona.com" @@ -9,16 +9,17 @@ RUN set -ex; \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 4D1BB29D63D98E422B2113B19334A25F8507EFA5 99DB70FAE1D7CE227FB6488205B555B38483C65D 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1; \ gpg --batch --export --armor 4D1BB29D63D98E422B2113B19334A25F8507EFA5 > ${GNUPGHOME}/PERCONA-PACKAGING-KEY; \ gpg --batch --export --armor 99DB70FAE1D7CE227FB6488205B555B38483C65D > ${GNUPGHOME}/RPM-GPG-KEY-centosofficial; \ - gpg --batch --export --armor 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 > ${GNUPGHOME}/RPM-GPG-KEY-EPEL-8; \ - rpmkeys --import ${GNUPGHOME}/PERCONA-PACKAGING-KEY ${GNUPGHOME}/RPM-GPG-KEY-centosofficial ${GNUPGHOME}/RPM-GPG-KEY-EPEL-8; \ + gpg --batch --export --armor 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 > ${GNUPGHOME}/RPM-GPG-KEY-EPEL-9; \ + rpmkeys --import ${GNUPGHOME}/PERCONA-PACKAGING-KEY ${GNUPGHOME}/RPM-GPG-KEY-centosofficial ${GNUPGHOME}/RPM-GPG-KEY-EPEL-9; \ curl -Lf -o /tmp/percona-release.rpm https://repo.percona.com/yum/percona-release-latest.noarch.rpm; \ rpmkeys --checksig /tmp/percona-release.rpm; \ + microdnf install -y findutils; \ rpm -i /tmp/percona-release.rpm; \ rm -rf "$GNUPGHOME" /tmp/percona-release.rpm; \ rpm --import /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY ENV PSMDB_VERSION 7.0.15-9 -ENV OS_VER el8 +ENV OS_VER el9 ENV FULL_PERCONA_VERSION "$PSMDB_VERSION.$OS_VER" ENV K8S_TOOLS_VERSION "0.5.0" ENV PSMDB_REPO release @@ -30,16 +31,16 @@ ARG PERCONA_TELEMETRY_DISABLE=1 RUN set -ex; \ percona-release enable psmdb-70 ${PSMDB_REPO}; \ - dnf config-manager --enable ol8_u4_security_validation; \ - dnf -y update openssh; \ - dnf -y update bind-export-libs; \ - dnf -y update glibc; \ - dnf -y update libgcrypt; \ - dnf -y install \ + #dnf config-manager --enable ol8_u4_security_validation; \ + microdnf -y update openssh; \ + #dnf -y update bind-export-libs; \ + #dnf -y update glibc; \ + microdnf -y update libgcrypt; \ + microdnf -y install \ percona-server-mongodb-mongos-${FULL_PERCONA_VERSION} \ percona-server-mongodb-tools-${FULL_PERCONA_VERSION} \ percona-mongodb-mongosh \ - numactl \ + numactl-libs \ procps-ng \ jq \ tar \ @@ -47,11 +48,16 @@ RUN set -ex; \ cyrus-sasl-gssapi \ policycoreutils; \ \ - curl -Lf -o /tmp/Percona-Server-MongoDB-server.rpm http://repo.percona.com/psmdb-70/yum/${PSMDB_REPO}/8/RPMS/x86_64/percona-server-mongodb-server-${FULL_PERCONA_VERSION}.x86_64.rpm; \ + curl -Lf -o /tmp/Percona-Server-MongoDB-server.rpm http://repo.percona.com/psmdb-70/yum/${PSMDB_REPO}/9/RPMS/x86_64/percona-server-mongodb-server-${FULL_PERCONA_VERSION}.x86_64.rpm; \ + curl -O https://download.rockylinux.org/pub/rocky/RPM-GPG-KEY-Rocky-9; \ + rpm --import RPM-GPG-KEY-Rocky-9; \ + curl -Lf -o /tmp/numactl.rpm https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/Packages/n/numactl-2.0.18-2.${OS_VER}.x86_64.rpm; \ + rpmkeys --checksig /tmp/numactl.rpm; \ rpmkeys --checksig /tmp/Percona-Server-MongoDB-server.rpm; \ rpm -iv /tmp/Percona-Server-MongoDB-server.rpm --nodeps; \ - rm -rf /tmp/Percona-Server-MongoDB-server.rpm; \ - dnf clean all; \ + rpm -i /tmp/numactl.rpm; \ + rm -rf /tmp/numactl.rpm /tmp/Percona-Server-MongoDB-server.rpm; \ + microdnf clean all; \ rm -rf /var/cache/dnf /var/cache/yum /data/db && mkdir -p /data/db; \ chown -R 1001:0 /data/db diff --git a/percona-server-mongodb-7.0/Dockerfile.aarch64 b/percona-server-mongodb-7.0/Dockerfile.aarch64 index 46ecbcfd..dae0658a 100644 --- a/percona-server-mongodb-7.0/Dockerfile.aarch64 +++ b/percona-server-mongodb-7.0/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM oraclelinux:8 +FROM redhat/ubi9-minimal LABEL org.opencontainers.image.authors="info@percona.com" @@ -8,16 +8,17 @@ RUN set -ex; \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 4D1BB29D63D98E422B2113B19334A25F8507EFA5 99DB70FAE1D7CE227FB6488205B555B38483C65D 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1; \ gpg --batch --export --armor 4D1BB29D63D98E422B2113B19334A25F8507EFA5 > ${GNUPGHOME}/PERCONA-PACKAGING-KEY; \ gpg --batch --export --armor 99DB70FAE1D7CE227FB6488205B555B38483C65D > ${GNUPGHOME}/RPM-GPG-KEY-centosofficial; \ - gpg --batch --export --armor 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 > ${GNUPGHOME}/RPM-GPG-KEY-EPEL-8; \ - rpmkeys --import ${GNUPGHOME}/PERCONA-PACKAGING-KEY ${GNUPGHOME}/RPM-GPG-KEY-centosofficial ${GNUPGHOME}/RPM-GPG-KEY-EPEL-8; \ + gpg --batch --export --armor 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 > ${GNUPGHOME}/RPM-GPG-KEY-EPEL-9; \ + rpmkeys --import ${GNUPGHOME}/PERCONA-PACKAGING-KEY ${GNUPGHOME}/RPM-GPG-KEY-centosofficial ${GNUPGHOME}/RPM-GPG-KEY-EPEL-9; \ curl -Lf -o /tmp/percona-release.rpm https://repo.percona.com/yum/percona-release-latest.noarch.rpm; \ rpmkeys --checksig /tmp/percona-release.rpm; \ + microdnf install -y findutils; \ rpm -i /tmp/percona-release.rpm; \ rm -rf "$GNUPGHOME" /tmp/percona-release.rpm; \ rpm --import /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY ENV PSMDB_VERSION 7.0.15-9 -ENV OS_VER el8 +ENV OS_VER el9 ENV FULL_PERCONA_VERSION "$PSMDB_VERSION.$OS_VER" ENV K8S_TOOLS_VERSION "0.5.0" ENV PSMDB_REPO release @@ -29,16 +30,16 @@ RUN set -ex; \ sed -i "s|x86_64|x86_64 aarch64|" /usr/bin/percona-release; \ percona-release enable psmdb-70 ${PSMDB_REPO}; \ percona-release enable telemetry ${PSMDB_REPO}; \ - dnf config-manager --enable ol8_u4_security_validation; \ - dnf -y update openssh; \ - dnf -y update bind-export-libs; \ - dnf -y update glibc; \ - dnf -y update libgcrypt; \ - dnf -y install \ + #microdnf config-manager --enable ol9_u4_security_validation; \ + microdnf -y update openssh; \ + #microdnf -y update bind-export-libs; \ + microdnf -y update glibc; \ + microdnf -y update libgcrypt; \ + microdnf -y install \ percona-server-mongodb-mongos-${FULL_PERCONA_VERSION} \ percona-server-mongodb-tools-${FULL_PERCONA_VERSION} \ percona-mongodb-mongosh \ - numactl \ + numactl-libs \ procps-ng \ jq \ tar \ @@ -46,12 +47,17 @@ RUN set -ex; \ cyrus-sasl-gssapi \ policycoreutils; \ \ + curl -O https://download.rockylinux.org/pub/rocky/RPM-GPG-KEY-Rocky-9; \ + rpm --import RPM-GPG-KEY-Rocky-9; \ ARCH="$(uname -m)"; \ - curl -Lf -o /tmp/Percona-Server-MongoDB-server.rpm http://repo.percona.com/psmdb-70/yum/${PSMDB_REPO}/8/RPMS/${ARCH}/percona-server-mongodb-server-${FULL_PERCONA_VERSION}.${ARCH}.rpm; \ + curl -Lf -o /tmp/Percona-Server-MongoDB-server.rpm http://repo.percona.com/psmdb-70/yum/${PSMDB_REPO}/9/RPMS/${ARCH}/percona-server-mongodb-server-${FULL_PERCONA_VERSION}.${ARCH}.rpm; \ + curl -Lf -o /tmp/numactl.rpm https://download.rockylinux.org/pub/rocky/9/BaseOS/aarch64/os/Packages/n/numactl-2.0.18-2.${OS_VER}.${ARCH}.rpm; \ + rpmkeys --checksig /tmp/numactl.rpm; \ rpmkeys --checksig /tmp/Percona-Server-MongoDB-server.rpm; \ rpm -iv /tmp/Percona-Server-MongoDB-server.rpm --nodeps; \ - rm -rf /tmp/Percona-Server-MongoDB-server.rpm; \ - dnf clean all; \ + rpm -i /tmp/numactl.rpm; \ + rm -rf /tmp/numactl.rpm /tmp/Percona-Server-MongoDB-server.rpm; \ + microdnf clean all; \ rm -rf /var/cache/dnf /var/cache/yum /data/db && mkdir -p /data/db; \ chown -R 1001:0 /data/db diff --git a/percona-server-mongodb-7.0/Dockerfile.debug b/percona-server-mongodb-7.0/Dockerfile.debug index 5c4d7f78..d2073724 100644 --- a/percona-server-mongodb-7.0/Dockerfile.debug +++ b/percona-server-mongodb-7.0/Dockerfile.debug @@ -28,7 +28,7 @@ USER 0 RUN set -ex; \ sed -i 's/exec "$@"/exec "$@" -vvv || sleep infinity/' /entrypoint.sh; \ - dnf -y install \ + microdnf -y install \ net-tools \ gdb \ nc \ @@ -39,7 +39,7 @@ RUN set -ex; \ percona-server-mongodb-tools-debuginfo-${FULL_PERCONA_VERSION} \ percona-server-mongodb-mongos-debuginfo-${FULL_PERCONA_VERSION} \ percona-server-mongodb-tools-${FULL_PERCONA_VERSION}; \ - dnf clean all; \ + microdnf clean all; \ rm -rf /var/cache/dnf /var/cache/yum ADD https://raw.githubusercontent.com/Percona-Lab/telemetry-agent/phase-0/call-home.sh /call-home.sh diff --git a/percona-server-mongodb-7.0/Dockerfile.k8s b/percona-server-mongodb-7.0/Dockerfile.k8s index fcc23ac2..7d7b20d9 100644 --- a/percona-server-mongodb-7.0/Dockerfile.k8s +++ b/percona-server-mongodb-7.0/Dockerfile.k8s @@ -1,4 +1,4 @@ -FROM redhat/ubi8-minimal +FROM redhat/ubi9-minimal # Please don't remove old-style LABEL since it's needed for RedHat certification LABEL name="Percona Server for MongoDB" \ @@ -19,7 +19,7 @@ LABEL org.opencontainers.image.license="SSPLv1" LABEL org.opencontainers.image.authors="info@percona.com" ENV PSMDB_VERSION 7.0.15-9 -ENV OS_VER el8 +ENV OS_VER el9 ENV FULL_PERCONA_VERSION "$PSMDB_VERSION.$OS_VER" ENV K8S_TOOLS_VERSION "0.5.0" ENV PSMDB_REPO release @@ -32,12 +32,12 @@ ARG PERCONA_TELEMETRY_DISABLE=1 # check repository package signature in secure way RUN set -ex; \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 4D1BB29D63D98E422B2113B19334A25F8507EFA5 99DB70FAE1D7CE227FB6488205B555B38483C65D 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 76FD3DB13AB67410 76FD3DB13AB67410B89DB10E82562EA9AD986DA3; \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 4D1BB29D63D98E422B2113B19334A25F8507EFA5 99DB70FAE1D7CE227FB6488205B555B38483C65D 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 3E6D826D3FBAB389C2F38E34BC4D06A08D8B756F; \ gpg --batch --export --armor 4D1BB29D63D98E422B2113B19334A25F8507EFA5 > ${GNUPGHOME}/PERCONA-PACKAGING-KEY; \ gpg --batch --export --armor 99DB70FAE1D7CE227FB6488205B555B38483C65D > ${GNUPGHOME}/RPM-GPG-KEY-centosofficial; \ - gpg --batch --export --armor 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 > ${GNUPGHOME}/RPM-GPG-KEY-EPEL-8; \ - gpg --batch --export --armor 76FD3DB13AB67410B89DB10E82562EA9AD986DA3 > ${GNUPGHOME}/RPM-GPG-KEY-oracle; \ - rpmkeys --import ${GNUPGHOME}/PERCONA-PACKAGING-KEY ${GNUPGHOME}/RPM-GPG-KEY-centosofficial ${GNUPGHOME}/RPM-GPG-KEY-EPEL-8 ${GNUPGHOME}/RPM-GPG-KEY-oracle; \ + gpg --batch --export --armor 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 > ${GNUPGHOME}/RPM-GPG-KEY-EPEL-9; \ + gpg --batch --export --armor 3E6D826D3FBAB389C2F38E34BC4D06A08D8B756F > ${GNUPGHOME}/RPM-GPG-KEY-oracle; \ + rpmkeys --import ${GNUPGHOME}/PERCONA-PACKAGING-KEY ${GNUPGHOME}/RPM-GPG-KEY-centosofficial ${GNUPGHOME}/RPM-GPG-KEY-EPEL-9 ${GNUPGHOME}/RPM-GPG-KEY-oracle; \ microdnf install -y findutils; \ curl -Lf -o /tmp/percona-release.rpm https://repo.percona.com/yum/percona-release-latest.noarch.rpm; \ rpmkeys --checksig /tmp/percona-release.rpm; \ @@ -47,11 +47,10 @@ RUN set -ex; \ percona-release enable psmdb-70 ${PSMDB_REPO} RUN set -ex; \ - curl -Lf -o /tmp/jq.rpm http://vault.centos.org/centos/8/AppStream/x86_64/os/Packages/jq-1.5-12.el8.x86_64.rpm; \ - curl -Lf -o /tmp/oniguruma.rpm http://vault.centos.org/centos/8/AppStream/x86_64/os/Packages/oniguruma-6.8.2-2.el8.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; \ rpmkeys --checksig /tmp/jq.rpm /tmp/oniguruma.rpm; \ - \ - rpm -i /tmp/jq.rpm /tmp/oniguruma.rpm; \ + rpm -i /tmp/oniguruma.rpm /tmp/jq.rpm; \ rm -rf /tmp/jq.rpm /tmp/oniguruma.rpm RUN set -ex; \ @@ -61,14 +60,13 @@ RUN set -ex; \ percona-mongodb-mongosh \ numactl-libs \ shadow-utils \ - curl \ tar \ procps-ng \ cyrus-sasl-gssapi \ policycoreutils; \ \ - curl -Lf -o /tmp/Percona-Server-MongoDB-server.rpm http://repo.percona.com/psmdb-70/yum/${PSMDB_REPO}/8/RPMS/x86_64/percona-server-mongodb-server-${FULL_PERCONA_VERSION}.x86_64.rpm; \ - curl -Lf -o /tmp/numactl.rpm https://yum.oracle.com/repo/OracleLinux/OL8/baseos/latest/x86_64/getPackage/numactl-2.0.12-11.el8.x86_64.rpm; \ + curl -Lf -o /tmp/Percona-Server-MongoDB-server.rpm http://repo.percona.com/psmdb-70/yum/${PSMDB_REPO}/9/RPMS/x86_64/percona-server-mongodb-server-${FULL_PERCONA_VERSION}.x86_64.rpm; \ + curl -Lf -o /tmp/numactl.rpm https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/x86_64/getPackage/numactl-2.0.16-3.el9.x86_64.rpm; \ rpmkeys --checksig /tmp/numactl.rpm /tmp/Percona-Server-MongoDB-server.rpm; \ rpm -iv /tmp/Percona-Server-MongoDB-server.rpm --nodeps; \ rpm -i /tmp/numactl.rpm; \ @@ -117,7 +115,7 @@ ARG DEBUG RUN if [[ -n $DEBUG ]] ; then \ set -ex; \ sed -i 's/exec "$@"/exec "$@" -vvv || sleep infinity/' /entrypoint.sh; \ - curl -Lf -o /tmp/telnet.rpm http://vault.centos.org/centos/8/AppStream/x86_64/os/Packages/telnet-0.17-76.el8.x86_64.rpm; \ + curl -Lf -o /tmp/telnet.rpm http://vault.centos.org/centos/9/AppStream/x86_64/os/Packages/telnet-0.17-76.el9.x86_64.rpm; \ rpm -i /tmp/telnet.rpm; \ rm -f /tmp/telnet.rpm; \ diff --git a/percona-server-mongodb-7.0/Dockerfile.ubi9 b/percona-server-mongodb-7.0/Dockerfile.ubi9 index 1680a23b..a91c086b 100644 --- a/percona-server-mongodb-7.0/Dockerfile.ubi9 +++ b/percona-server-mongodb-7.0/Dockerfile.ubi9 @@ -17,9 +17,9 @@ RUN set -ex; \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 4D1BB29D63D98E422B2113B19334A25F8507EFA5 99DB70FAE1D7CE227FB6488205B555B38483C65D 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 3E6D826D3FBAB389C2F38E34BC4D06A08D8B756F; \ gpg --batch --export --armor 4D1BB29D63D98E422B2113B19334A25F8507EFA5 > ${GNUPGHOME}/PERCONA-PACKAGING-KEY; \ gpg --batch --export --armor 99DB70FAE1D7CE227FB6488205B555B38483C65D > ${GNUPGHOME}/RPM-GPG-KEY-centosofficial; \ - gpg --batch --export --armor 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 > ${GNUPGHOME}/RPM-GPG-KEY-EPEL-8; \ + gpg --batch --export --armor 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 > ${GNUPGHOME}/RPM-GPG-KEY-EPEL-9; \ gpg --batch --export --armor 3E6D826D3FBAB389C2F38E34BC4D06A08D8B756F > ${GNUPGHOME}/RPM-GPG-KEY-oracle; \ - rpmkeys --import ${GNUPGHOME}/PERCONA-PACKAGING-KEY ${GNUPGHOME}/RPM-GPG-KEY-centosofficial ${GNUPGHOME}/RPM-GPG-KEY-EPEL-8 ${GNUPGHOME}/RPM-GPG-KEY-oracle; \ + rpmkeys --import ${GNUPGHOME}/PERCONA-PACKAGING-KEY ${GNUPGHOME}/RPM-GPG-KEY-centosofficial ${GNUPGHOME}/RPM-GPG-KEY-EPEL-9 ${GNUPGHOME}/RPM-GPG-KEY-oracle; \ microdnf install -y findutils; \ curl -Lf -o /tmp/percona-release.rpm https://repo.percona.com/yum/percona-release-latest.noarch.rpm; \ rpmkeys --checksig /tmp/percona-release.rpm; \ diff --git a/percona-server-mongodb-8.0/Dockerfile b/percona-server-mongodb-8.0/Dockerfile index cd20b896..771608c5 100644 --- a/percona-server-mongodb-8.0/Dockerfile +++ b/percona-server-mongodb-8.0/Dockerfile @@ -1,4 +1,4 @@ -FROM oraclelinux:8 +FROM redhat/ubi9-minimal LABEL org.opencontainers.image.authors="info@percona.com" @@ -8,16 +8,17 @@ RUN set -ex; \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 4D1BB29D63D98E422B2113B19334A25F8507EFA5 99DB70FAE1D7CE227FB6488205B555B38483C65D 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1; \ gpg --batch --export --armor 4D1BB29D63D98E422B2113B19334A25F8507EFA5 > ${GNUPGHOME}/PERCONA-PACKAGING-KEY; \ gpg --batch --export --armor 99DB70FAE1D7CE227FB6488205B555B38483C65D > ${GNUPGHOME}/RPM-GPG-KEY-centosofficial; \ - gpg --batch --export --armor 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 > ${GNUPGHOME}/RPM-GPG-KEY-EPEL-8; \ - rpmkeys --import ${GNUPGHOME}/PERCONA-PACKAGING-KEY ${GNUPGHOME}/RPM-GPG-KEY-centosofficial ${GNUPGHOME}/RPM-GPG-KEY-EPEL-8; \ + gpg --batch --export --armor 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 > ${GNUPGHOME}/RPM-GPG-KEY-EPEL-9; \ + rpmkeys --import ${GNUPGHOME}/PERCONA-PACKAGING-KEY ${GNUPGHOME}/RPM-GPG-KEY-centosofficial ${GNUPGHOME}/RPM-GPG-KEY-EPEL-9; \ curl -Lf -o /tmp/percona-release.rpm https://repo.percona.com/yum/percona-release-latest.noarch.rpm; \ rpmkeys --checksig /tmp/percona-release.rpm; \ + microdnf install -y findutils; \ rpm -i /tmp/percona-release.rpm; \ rm -rf "$GNUPGHOME" /tmp/percona-release.rpm; \ rpm --import /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY ENV PSMDB_VERSION 8.0.1-1 -ENV OS_VER el8 +ENV OS_VER el9 ENV FULL_PERCONA_VERSION "$PSMDB_VERSION.$OS_VER" ENV K8S_TOOLS_VERSION "0.5.0" ENV PSMDB_REPO testing @@ -29,16 +30,16 @@ ARG PERCONA_TELEMETRY_DISABLE=1 RUN set -ex; \ percona-release enable psmdb-80 ${PSMDB_REPO}; \ percona-release enable telemetry ${PSMDB_REPO}; \ - dnf config-manager --enable ol8_u4_security_validation; \ - dnf -y update openssh; \ - dnf -y update bind-export-libs; \ - dnf -y update glibc; \ - dnf -y update libgcrypt; \ - dnf -y install \ + #microdnf config-manager --enable ol8_u4_security_validation; \ + microdnf -y update openssh; \ + #microdnf -y update bind-export-libs; \ + #microdnf -y update glibc; \ + microdnf -y update libgcrypt; \ + microdnf -y install \ percona-server-mongodb-mongos-${FULL_PERCONA_VERSION} \ percona-server-mongodb-tools-${FULL_PERCONA_VERSION} \ percona-mongodb-mongosh \ - numactl \ + numactl-libs \ procps-ng \ jq \ tar \ @@ -46,11 +47,16 @@ RUN set -ex; \ cyrus-sasl-gssapi \ policycoreutils; \ \ - curl -Lf -o /tmp/Percona-Server-MongoDB-server.rpm http://repo.percona.com/psmdb-80/yum/${PSMDB_REPO}/8/RPMS/x86_64/percona-server-mongodb-server-${FULL_PERCONA_VERSION}.x86_64.rpm; \ + curl -O https://download.rockylinux.org/pub/rocky/RPM-GPG-KEY-Rocky-9; \ + rpm --import RPM-GPG-KEY-Rocky-9; \ + curl -Lf -o /tmp/Percona-Server-MongoDB-server.rpm http://repo.percona.com/psmdb-80/yum/${PSMDB_REPO}/9/RPMS/x86_64/percona-server-mongodb-server-${FULL_PERCONA_VERSION}.x86_64.rpm; \ + curl -Lf -o /tmp/numactl.rpm https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/Packages/n/numactl-2.0.18-2.${OS_VER}.x86_64.rpm; \ + rpmkeys --checksig /tmp/numactl.rpm; \ rpmkeys --checksig /tmp/Percona-Server-MongoDB-server.rpm; \ rpm -iv /tmp/Percona-Server-MongoDB-server.rpm --nodeps; \ - rm -rf /tmp/Percona-Server-MongoDB-server.rpm; \ - dnf clean all; \ + rpm -i /tmp/numactl.rpm; \ + rm -rf /tmp/numactl.rpm /tmp/Percona-Server-MongoDB-server.rpm; \ + microdnf clean all; \ rm -rf /var/cache/dnf /var/cache/yum /data/db && mkdir -p /data/db; \ chown -R 1001:0 /data/db diff --git a/percona-server-mongodb-8.0/Dockerfile-dockerhub b/percona-server-mongodb-8.0/Dockerfile-dockerhub index 18c4b5f3..860e4966 100644 --- a/percona-server-mongodb-8.0/Dockerfile-dockerhub +++ b/percona-server-mongodb-8.0/Dockerfile-dockerhub @@ -1,5 +1,5 @@ # This Dockerfile should be used for docker official repo -FROM oraclelinux:8 +FROM redhat/ubi9-minimal LABEL org.opencontainers.image.authors="info@percona.com" @@ -9,16 +9,17 @@ RUN set -ex; \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 4D1BB29D63D98E422B2113B19334A25F8507EFA5 99DB70FAE1D7CE227FB6488205B555B38483C65D 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1; \ gpg --batch --export --armor 4D1BB29D63D98E422B2113B19334A25F8507EFA5 > ${GNUPGHOME}/PERCONA-PACKAGING-KEY; \ gpg --batch --export --armor 99DB70FAE1D7CE227FB6488205B555B38483C65D > ${GNUPGHOME}/RPM-GPG-KEY-centosofficial; \ - gpg --batch --export --armor 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 > ${GNUPGHOME}/RPM-GPG-KEY-EPEL-8; \ - rpmkeys --import ${GNUPGHOME}/PERCONA-PACKAGING-KEY ${GNUPGHOME}/RPM-GPG-KEY-centosofficial ${GNUPGHOME}/RPM-GPG-KEY-EPEL-8; \ + gpg --batch --export --armor 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 > ${GNUPGHOME}/RPM-GPG-KEY-EPEL-9; \ + rpmkeys --import ${GNUPGHOME}/PERCONA-PACKAGING-KEY ${GNUPGHOME}/RPM-GPG-KEY-centosofficial ${GNUPGHOME}/RPM-GPG-KEY-EPEL-9; \ curl -Lf -o /tmp/percona-release.rpm https://repo.percona.com/yum/percona-release-latest.noarch.rpm; \ rpmkeys --checksig /tmp/percona-release.rpm; \ + microdnf install -y findutils; \ rpm -i /tmp/percona-release.rpm; \ rm -rf "$GNUPGHOME" /tmp/percona-release.rpm; \ rpm --import /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY ENV PSMDB_VERSION 8.0.1-1 -ENV OS_VER el8 +ENV OS_VER el9 ENV FULL_PERCONA_VERSION "$PSMDB_VERSION.$OS_VER" ENV K8S_TOOLS_VERSION "0.5.0" ENV PSMDB_REPO testing @@ -31,16 +32,16 @@ ARG PERCONA_TELEMETRY_DISABLE=1 RUN set -ex; \ percona-release enable psmdb-80 ${PSMDB_REPO}; \ - dnf config-manager --enable ol8_u4_security_validation; \ - dnf -y update openssh; \ - dnf -y update bind-export-libs; \ - dnf -y update glibc; \ - dnf -y update libgcrypt; \ - dnf -y install \ + #microdnf config-manager --enable ol8_u4_security_validation; \ + microdnf -y update openssh; \ + #microdnf -y update bind-export-libs; \ + #microdnf -y update glibc; \ + microdnf -y update libgcrypt; \ + microdnf -y install \ percona-server-mongodb-mongos-${FULL_PERCONA_VERSION} \ percona-server-mongodb-tools-${FULL_PERCONA_VERSION} \ percona-mongodb-mongosh \ - numactl \ + numactl-libs \ procps-ng \ jq \ tar \ @@ -48,11 +49,16 @@ RUN set -ex; \ cyrus-sasl-gssapi \ policycoreutils; \ \ - curl -Lf -o /tmp/Percona-Server-MongoDB-server.rpm http://repo.percona.com/psmdb-80/yum/${PSMDB_REPO}/8/RPMS/x86_64/percona-server-mongodb-server-${FULL_PERCONA_VERSION}.x86_64.rpm; \ + curl -O https://download.rockylinux.org/pub/rocky/RPM-GPG-KEY-Rocky-9; \ + rpm --import RPM-GPG-KEY-Rocky-9; \ + curl -Lf -o /tmp/Percona-Server-MongoDB-server.rpm http://repo.percona.com/psmdb-80/yum/${PSMDB_REPO}/9/RPMS/x86_64/percona-server-mongodb-server-${FULL_PERCONA_VERSION}.x86_64.rpm; \ + curl -Lf -o /tmp/numactl.rpm https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/Packages/n/numactl-2.0.18-2.${OS_VER}.x86_64.rpm; \ + rpmkeys --checksig /tmp/numactl.rpm; \ rpmkeys --checksig /tmp/Percona-Server-MongoDB-server.rpm; \ rpm -iv /tmp/Percona-Server-MongoDB-server.rpm --nodeps; \ - rm -rf /tmp/Percona-Server-MongoDB-server.rpm; \ - dnf clean all; \ + rpm -i /tmp/numactl.rpm; \ + rm -rf /tmp/numactl.rpm /tmp/Percona-Server-MongoDB-server.rpm; \ + microdnf clean all; \ rm -rf /var/cache/dnf /var/cache/yum /data/db && mkdir -p /data/db; \ chown -R 1001:0 /data/db diff --git a/percona-server-mongodb-8.0/Dockerfile.aarch64 b/percona-server-mongodb-8.0/Dockerfile.aarch64 index fd004076..e41ad20f 100644 --- a/percona-server-mongodb-8.0/Dockerfile.aarch64 +++ b/percona-server-mongodb-8.0/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM oraclelinux:8 +FROM redhat/ubi9-minimal LABEL org.opencontainers.image.authors="info@percona.com" @@ -8,16 +8,17 @@ RUN set -ex; \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 4D1BB29D63D98E422B2113B19334A25F8507EFA5 99DB70FAE1D7CE227FB6488205B555B38483C65D 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1; \ gpg --batch --export --armor 4D1BB29D63D98E422B2113B19334A25F8507EFA5 > ${GNUPGHOME}/PERCONA-PACKAGING-KEY; \ gpg --batch --export --armor 99DB70FAE1D7CE227FB6488205B555B38483C65D > ${GNUPGHOME}/RPM-GPG-KEY-centosofficial; \ - gpg --batch --export --armor 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 > ${GNUPGHOME}/RPM-GPG-KEY-EPEL-8; \ - rpmkeys --import ${GNUPGHOME}/PERCONA-PACKAGING-KEY ${GNUPGHOME}/RPM-GPG-KEY-centosofficial ${GNUPGHOME}/RPM-GPG-KEY-EPEL-8; \ + gpg --batch --export --armor 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 > ${GNUPGHOME}/RPM-GPG-KEY-EPEL-9; \ + rpmkeys --import ${GNUPGHOME}/PERCONA-PACKAGING-KEY ${GNUPGHOME}/RPM-GPG-KEY-centosofficial ${GNUPGHOME}/RPM-GPG-KEY-EPEL-9; \ curl -Lf -o /tmp/percona-release.rpm https://repo.percona.com/yum/percona-release-latest.noarch.rpm; \ rpmkeys --checksig /tmp/percona-release.rpm; \ + microdnf install -y findutils; \ rpm -i /tmp/percona-release.rpm; \ rm -rf "$GNUPGHOME" /tmp/percona-release.rpm; \ rpm --import /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY ENV PSMDB_VERSION 8.0.1-1 -ENV OS_VER el8 +ENV OS_VER el9 ENV FULL_PERCONA_VERSION "$PSMDB_VERSION.$OS_VER" ENV K8S_TOOLS_VERSION "0.5.0" ENV PSMDB_REPO testing @@ -30,16 +31,16 @@ RUN set -ex; \ sed -i "s|x86_64|x86_64 aarch64|" /usr/bin/percona-release; \ percona-release enable psmdb-80 ${PSMDB_REPO}; \ percona-release enable telemetry ${PSMDB_REPO}; \ - dnf config-manager --enable ol8_u4_security_validation; \ - dnf -y update openssh; \ - dnf -y update bind-export-libs; \ - dnf -y update glibc; \ - dnf -y update libgcrypt; \ - dnf -y install \ + #microdnf config-manager --enable ol8_u4_security_validation; \ + microdnf -y update openssh; \ + #microdnf -y update bind-export-libs; \ + #microdnf -y update glibc; \ + microdnf -y update libgcrypt; \ + microdnf -y install \ percona-server-mongodb-mongos-${FULL_PERCONA_VERSION} \ percona-server-mongodb-tools-${FULL_PERCONA_VERSION} \ percona-mongodb-mongosh \ - numactl \ + numactl-libs \ procps-ng \ jq \ tar \ @@ -47,12 +48,20 @@ RUN set -ex; \ cyrus-sasl-gssapi \ policycoreutils; \ \ + echo test + +RUN set -ex; \ ARCH="$(uname -m)"; \ - curl -Lf -o /tmp/Percona-Server-MongoDB-server.rpm http://repo.percona.com/psmdb-80/yum/${PSMDB_REPO}/8/RPMS/${ARCH}/percona-server-mongodb-server-${FULL_PERCONA_VERSION}.${ARCH}.rpm; \ + curl -O https://download.rockylinux.org/pub/rocky/RPM-GPG-KEY-Rocky-9; \ + rpm --import RPM-GPG-KEY-Rocky-9; \ + curl -Lf -o /tmp/Percona-Server-MongoDB-server.rpm http://repo.percona.com/psmdb-80/yum/${PSMDB_REPO}/9/RPMS/${ARCH}/percona-server-mongodb-server-${FULL_PERCONA_VERSION}.${ARCH}.rpm; \ + curl -Lf -o /tmp/numactl.rpm https://download.rockylinux.org/pub/rocky/9/BaseOS/aarch64/os/Packages/n/numactl-2.0.18-2.${OS_VER}.${ARCH}.rpm; \ + rpmkeys --checksig /tmp/numactl.rpm; \ rpmkeys --checksig /tmp/Percona-Server-MongoDB-server.rpm; \ rpm -iv /tmp/Percona-Server-MongoDB-server.rpm --nodeps; \ - rm -rf /tmp/Percona-Server-MongoDB-server.rpm; \ - dnf clean all; \ + rpm -i /tmp/numactl.rpm; \ + rm -rf /tmp/numactl.rpm /tmp/Percona-Server-MongoDB-server.rpm; \ + microdnf clean all; \ rm -rf /var/cache/dnf /var/cache/yum /data/db && mkdir -p /data/db; \ chown -R 1001:0 /data/db diff --git a/percona-server-mongodb-8.0/Dockerfile.debug b/percona-server-mongodb-8.0/Dockerfile.debug index 1fbb3f65..c4b0e2e4 100644 --- a/percona-server-mongodb-8.0/Dockerfile.debug +++ b/percona-server-mongodb-8.0/Dockerfile.debug @@ -28,7 +28,7 @@ USER 0 RUN set -ex; \ sed -i 's/exec "$@"/exec "$@" -vvv || sleep infinity/' /entrypoint.sh; \ - dnf -y install \ + microdnf -y install \ net-tools \ gdb \ nc \ @@ -40,7 +40,7 @@ RUN set -ex; \ percona-server-mongodb-mongos-debuginfo-${FULL_PERCONA_VERSION} \ percona-server-mongodb-debugsource-${FULL_PERCONA_VERSION} \ percona-server-mongodb-tools-${FULL_PERCONA_VERSION}; \ - dnf clean all; \ + microdnf clean all; \ rm -rf /var/cache/dnf /var/cache/yum ADD https://raw.githubusercontent.com/Percona-Lab/telemetry-agent/phase-0/call-home.sh /call-home.sh diff --git a/percona-server-mongodb-8.0/Dockerfile.k8s b/percona-server-mongodb-8.0/Dockerfile.k8s index 8f954e19..d9745342 100644 --- a/percona-server-mongodb-8.0/Dockerfile.k8s +++ b/percona-server-mongodb-8.0/Dockerfile.k8s @@ -1,4 +1,4 @@ -FROM redhat/ubi8-minimal +FROM redhat/ubi9-minimal # Please don't remove old-style LABEL since it's needed for RedHat certification LABEL name="Percona Server for MongoDB" \ @@ -19,7 +19,7 @@ LABEL org.opencontainers.image.license="SSPLv1" LABEL org.opencontainers.image.authors="info@percona.com" ENV PSMDB_VERSION 8.0.0-1 -ENV OS_VER el8 +ENV OS_VER el9 ENV FULL_PERCONA_VERSION "$PSMDB_VERSION.$OS_VER" ENV K8S_TOOLS_VERSION "0.5.0" ENV PSMDB_REPO release @@ -33,12 +33,12 @@ ARG PERCONA_TELEMETRY_DISABLE=1 # check repository package signature in secure way RUN set -ex; \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 4D1BB29D63D98E422B2113B19334A25F8507EFA5 99DB70FAE1D7CE227FB6488205B555B38483C65D 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 76FD3DB13AB67410B89DB10E82562EA9AD986DA3; \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 4D1BB29D63D98E422B2113B19334A25F8507EFA5 99DB70FAE1D7CE227FB6488205B555B38483C65D 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 3E6D826D3FBAB389C2F38E34BC4D06A08D8B756F; \ gpg --batch --export --armor 4D1BB29D63D98E422B2113B19334A25F8507EFA5 > ${GNUPGHOME}/PERCONA-PACKAGING-KEY; \ gpg --batch --export --armor 99DB70FAE1D7CE227FB6488205B555B38483C65D > ${GNUPGHOME}/RPM-GPG-KEY-centosofficial; \ - gpg --batch --export --armor 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 > ${GNUPGHOME}/RPM-GPG-KEY-EPEL-8; \ - gpg --batch --export --armor 76FD3DB13AB67410B89DB10E82562EA9AD986DA3 > ${GNUPGHOME}/RPM-GPG-KEY-oracle; \ - rpmkeys --import ${GNUPGHOME}/PERCONA-PACKAGING-KEY ${GNUPGHOME}/RPM-GPG-KEY-centosofficial ${GNUPGHOME}/RPM-GPG-KEY-EPEL-8 ${GNUPGHOME}/RPM-GPG-KEY-oracle; \ + gpg --batch --export --armor 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 > ${GNUPGHOME}/RPM-GPG-KEY-EPEL-9; \ + gpg --batch --export --armor 3E6D826D3FBAB389C2F38E34BC4D06A08D8B756F > ${GNUPGHOME}/RPM-GPG-KEY-oracle; \ + rpmkeys --import ${GNUPGHOME}/PERCONA-PACKAGING-KEY ${GNUPGHOME}/RPM-GPG-KEY-centosofficial ${GNUPGHOME}/RPM-GPG-KEY-EPEL-9 ${GNUPGHOME}/RPM-GPG-KEY-oracle; \ microdnf install -y findutils; \ curl -Lf -o /tmp/percona-release.rpm https://repo.percona.com/yum/percona-release-latest.noarch.rpm; \ rpmkeys --checksig /tmp/percona-release.rpm; \ @@ -48,11 +48,10 @@ RUN set -ex; \ percona-release enable psmdb-80 ${PSMDB_REPO} RUN set -ex; \ - curl -Lf -o /tmp/jq.rpm http://vault.centos.org/centos/8/AppStream/x86_64/os/Packages/jq-1.5-12.el8.x86_64.rpm; \ - curl -Lf -o /tmp/oniguruma.rpm http://vault.centos.org/centos/8/AppStream/x86_64/os/Packages/oniguruma-6.8.2-2.el8.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; \ rpmkeys --checksig /tmp/jq.rpm /tmp/oniguruma.rpm; \ - \ - rpm -i /tmp/jq.rpm /tmp/oniguruma.rpm; \ + rpm -i /tmp/oniguruma.rpm /tmp/jq.rpm; \ rm -rf /tmp/jq.rpm /tmp/oniguruma.rpm RUN set -ex; \ @@ -62,14 +61,15 @@ RUN set -ex; \ percona-mongodb-mongosh \ numactl-libs \ shadow-utils \ - curl \ tar \ procps-ng \ cyrus-sasl-gssapi \ policycoreutils; \ \ - curl -Lf -o /tmp/Percona-Server-MongoDB-server.rpm http://repo.percona.com/psmdb-80/yum/${PSMDB_REPO}/8/RPMS/x86_64/percona-server-mongodb-server-${FULL_PERCONA_VERSION}.x86_64.rpm; \ - curl -Lf -o /tmp/numactl.rpm https://yum.oracle.com/repo/OracleLinux/OL8/baseos/latest/x86_64/getPackage/numactl-2.0.12-11.el8.x86_64.rpm; \ + curl -O https://download.rockylinux.org/pub/rocky/RPM-GPG-KEY-Rocky-9; \ + rpm --import RPM-GPG-KEY-Rocky-9; \ + curl -Lf -o /tmp/Percona-Server-MongoDB-server.rpm http://repo.percona.com/psmdb-80/yum/${PSMDB_REPO}/9/RPMS/x86_64/percona-server-mongodb-server-${FULL_PERCONA_VERSION}.x86_64.rpm; \ + curl -Lf -o /tmp/numactl.rpm https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/Packages/n/numactl-2.0.18-2.${OS_VER}.x86_64.rpm; \ rpmkeys --checksig /tmp/numactl.rpm /tmp/Percona-Server-MongoDB-server.rpm; \ rpm -iv /tmp/Percona-Server-MongoDB-server.rpm --nodeps; \ rpm -i /tmp/numactl.rpm; \ @@ -118,7 +118,7 @@ ARG DEBUG RUN if [[ -n $DEBUG ]] ; then \ set -ex; \ sed -i 's/exec "$@"/exec "$@" -vvv || sleep infinity/' /entrypoint.sh; \ - curl -Lf -o /tmp/telnet.rpm http://vault.centos.org/centos/8/AppStream/x86_64/os/Packages/telnet-0.17-76.el8.x86_64.rpm; \ + curl -Lf -o /tmp/telnet.rpm http://vault.centos.org/centos/9/AppStream/x86_64/os/Packages/telnet-0.17-76.el9.x86_64.rpm; \ rpm -i /tmp/telnet.rpm; \ rm -f /tmp/telnet.rpm; \ diff --git a/percona-server-mongodb-8.0/Dockerfile.ubi9 b/percona-server-mongodb-8.0/Dockerfile.ubi9 index 63959e37..ee602e20 100644 --- a/percona-server-mongodb-8.0/Dockerfile.ubi9 +++ b/percona-server-mongodb-8.0/Dockerfile.ubi9 @@ -18,9 +18,9 @@ RUN set -ex; \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 4D1BB29D63D98E422B2113B19334A25F8507EFA5 99DB70FAE1D7CE227FB6488205B555B38483C65D 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 3E6D826D3FBAB389C2F38E34BC4D06A08D8B756F; \ gpg --batch --export --armor 4D1BB29D63D98E422B2113B19334A25F8507EFA5 > ${GNUPGHOME}/PERCONA-PACKAGING-KEY; \ gpg --batch --export --armor 99DB70FAE1D7CE227FB6488205B555B38483C65D > ${GNUPGHOME}/RPM-GPG-KEY-centosofficial; \ - gpg --batch --export --armor 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 > ${GNUPGHOME}/RPM-GPG-KEY-EPEL-8; \ + gpg --batch --export --armor 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 > ${GNUPGHOME}/RPM-GPG-KEY-EPEL-9; \ gpg --batch --export --armor 3E6D826D3FBAB389C2F38E34BC4D06A08D8B756F > ${GNUPGHOME}/RPM-GPG-KEY-oracle; \ - rpmkeys --import ${GNUPGHOME}/PERCONA-PACKAGING-KEY ${GNUPGHOME}/RPM-GPG-KEY-centosofficial ${GNUPGHOME}/RPM-GPG-KEY-EPEL-8 ${GNUPGHOME}/RPM-GPG-KEY-oracle; \ + rpmkeys --import ${GNUPGHOME}/PERCONA-PACKAGING-KEY ${GNUPGHOME}/RPM-GPG-KEY-centosofficial ${GNUPGHOME}/RPM-GPG-KEY-EPEL-9 ${GNUPGHOME}/RPM-GPG-KEY-oracle; \ microdnf install -y findutils; \ curl -Lf -o /tmp/percona-release.rpm https://repo.percona.com/yum/percona-release-latest.noarch.rpm; \ rpmkeys --checksig /tmp/percona-release.rpm; \ @@ -30,7 +30,11 @@ RUN set -ex; \ percona-release enable psmdb-80 ${PSMDB_REPO} RUN set -ex; \ - microdnf install -y jq + 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; \ + rpmkeys --checksig /tmp/jq.rpm /tmp/oniguruma.rpm; \ + rpm -i /tmp/oniguruma.rpm /tmp/jq.rpm; \ + rm -rf /tmp/jq.rpm /tmp/oniguruma.rpm RUN set -ex; \ microdnf -y install \ @@ -44,8 +48,10 @@ RUN set -ex; \ cyrus-sasl-gssapi \ policycoreutils; \ \ + curl -O https://download.rockylinux.org/pub/rocky/RPM-GPG-KEY-Rocky-9; \ + rpm --import RPM-GPG-KEY-Rocky-9; \ curl -Lf -o /tmp/Percona-Server-MongoDB-server.rpm http://repo.percona.com/psmdb-80/yum/${PSMDB_REPO}/9/RPMS/x86_64/percona-server-mongodb-server-${FULL_PERCONA_VERSION}.x86_64.rpm; \ - curl -Lf -o /tmp/numactl.rpm https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/x86_64/getPackage/numactl-2.0.16-1.el9.x86_64.rpm; \ + curl -Lf -o /tmp/numactl.rpm https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/Packages/n/numactl-2.0.18-2.${OS_VER}.x86_64.rpm; \ rpmkeys --checksig /tmp/numactl.rpm /tmp/Percona-Server-MongoDB-server.rpm; \ rpm -iv /tmp/Percona-Server-MongoDB-server.rpm --nodeps; \ rpm -i /tmp/numactl.rpm; \