Merge branch 'main' into RM-1420-PS-8.0.39-30

percona · Sep 23, 2024 · 7acd4e7 · 7acd4e7
2 parents 8a48658 + 021c399
commit 7acd4e7
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 19 deletions.
diff --git a/fluentbit/Dockerfile b/fluentbit/Dockerfile
@@ -21,18 +21,18 @@ RUN export GNUPGHOME="$(mktemp -d)" \
  && rpm -i /tmp/percona-release.rpm \
  && rm -rf "$GNUPGHOME" /tmp/percona-release.rpm \
  && rpm --import /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY \
- && percona-release setup pdpxc-8.0.36
+ && percona-release setup pdpxc-8.0.37
 
 # install exact version of PS for repeatability
-ENV PERCONA_VERSION 8.0.36-28.1.el9
+ENV PERCONA_VERSION 8.0.37-29.1.el9
 
 # fluentbit does not have el8 repo and the doc suggests installing el7 rpm
 RUN set -ex; \
  microdnf install -y hostname postgresql-libs shadow-utils yum-utils logrotate make libpq procps-ng compat-openssl11 \
  percona-xtradb-cluster-client-${PERCONA_VERSION} tar vim-minimal; \
  curl -Lf https://github.com/michaloo/go-cron/releases/download/v0.0.2/go-cron.tar.gz -o /tmp/go-cron.tar.gz; \
  tar xvf /tmp/go-cron.tar.gz -C /usr/bin; \
- curl -Lf https://packages.fluentbit.io/centos/9/x86_64/fluent-bit-3.1.4-1.x86_64.rpm -o /tmp/fluent-bit.rpm; \
+ curl -Lf https://packages.fluentbit.io/centos/9/x86_64/fluent-bit-3.1.8-1.x86_64.rpm -o /tmp/fluent-bit.rpm; \
  rpmkeys --checksig /tmp/fluent-bit.rpm; \
  rpm -i /tmp/fluent-bit.rpm; \
  rm -rf /var/cache

diff --git a/haproxy/Dockerfile b/haproxy/Dockerfile
@@ -17,18 +17,18 @@ RUN export GNUPGHOME="$(mktemp -d)" \
  && microdnf install -y findutils \
  && gpg --keyserver keyserver.ubuntu.com --recv-keys 4D1BB29D63D98E422B2113B19334A25F8507EFA5 3E6D826D3FBAB389C2F38E34BC4D06A08D8B756F 4D1BB29D63D98E422B2113B19334A25F8507EFA5\
  && gpg --export --armor 4D1BB29D63D98E422B2113B19334A25F8507EFA5 > ${GNUPGHOME}/PERCONA-PACKAGING-KEY \
- && gpg --export --armor 4D1BB29D63D98E422B2113B19334A25F8507EFA5 > ${GNUPGHOME}/PERCONA-PACKAGING-KEY \
+  && gpg --export --armor 4D1BB29D63D98E422B2113B19334A25F8507EFA5 > ${GNUPGHOME}/PERCONA-PACKAGING-KEY \
  && gpg --export --armor 3E6D826D3FBAB389C2F38E34BC4D06A08D8B756F > ${GNUPGHOME}/RPM-GPG-KEY-oracle \
  && rpmkeys --import ${GNUPGHOME}/PERCONA-PACKAGING-KEY ${GNUPGHOME}/RPM-GPG-KEY-oracle ${GNUPGHOME}/PERCONA-PACKAGING-KEY\
  && curl -Lf -o /tmp/percona-release.rpm https://repo.percona.com/yum/percona-release-latest.noarch.rpm \
  && rpmkeys --checksig /tmp/percona-release.rpm \
  && rpm -i /tmp/percona-release.rpm \
  && rm -rf "$GNUPGHOME" /tmp/percona-release.rpm \
  && rpm --import /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY \
- && percona-release setup pdpxc-8.0.35
+ && percona-release enable pdpxc-8.0.37 release
 
 # install exact version of PS for repeatability
-ENV PERCONA_VERSION 8.0.35-27.1.el9
+ENV PERCONA_VERSION 8.0.37-29.1.el9
 
 RUN set -ex; \
  microdnf install -y \

diff --git a/percona-backup-mongodb/Dockerfile.aarch64 b/percona-backup-mongodb/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM redhat/ubi9-minimal
+FROM redhat/ubi8-minimal
 
 # Please don't remove old-style LABEL since it's needed for RedHat certification
 LABEL name="Percona Backup for MongoDB" \
@@ -15,8 +15,8 @@ LABEL org.opencontainers.image.title="Percona Backup for MongoDB" \
  org.opencontainers.image.authors="info@percona.com"
 
 ENV PBM_VERSION 2.6.0-1
-ENV PBM_REPO_CH experimental
-ENV OS_VER el9
+ENV PBM_REPO_CH release
+ENV OS_VER el8
 ENV FULL_PBM_VERSION "$PBM_VERSION.$OS_VER"
 
 # check repository package signature in secure way

diff --git a/percona-server-mongodb-6.0/Dockerfile b/percona-server-mongodb-6.0/Dockerfile
@@ -16,7 +16,7 @@ RUN set -ex; \
  rm -rf "$GNUPGHOME" /tmp/percona-release.rpm; \
  rpm --import /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY
 
-ENV PSMDB_VERSION 6.0.16-13
+ENV PSMDB_VERSION 6.0.17-14
 ENV OS_VER el8
 ENV FULL_PERCONA_VERSION "$PSMDB_VERSION.$OS_VER"
 ENV K8S_TOOLS_VERSION "0.5.0"

diff --git a/percona-server-mongodb-6.0/Dockerfile.aarch64 b/percona-server-mongodb-6.0/Dockerfile.aarch64
@@ -16,7 +16,7 @@ RUN set -ex; \
  rm -rf "$GNUPGHOME" /tmp/percona-release.rpm; \
  rpm --import /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY
 
-ENV PSMDB_VERSION 6.0.16-13
+ENV PSMDB_VERSION 6.0.17-14
 ENV OS_VER el8
 ENV FULL_PERCONA_VERSION "$PSMDB_VERSION.$OS_VER"
 ENV K8S_TOOLS_VERSION "0.5.0"

diff --git a/percona-server-mongodb-6.0/Dockerfile.k8s b/percona-server-mongodb-6.0/Dockerfile.k8s
@@ -18,7 +18,7 @@ plus additional enterprise-grade functionality."
 LABEL org.opencontainers.image.license="SSPLv1"
 LABEL org.opencontainers.image.authors="info@percona.com"
 
-ENV PSMDB_VERSION 6.0.16-13
+ENV PSMDB_VERSION 6.0.17-14
 ENV OS_VER el8
 ENV FULL_PERCONA_VERSION "$PSMDB_VERSION.$OS_VER"
 ENV K8S_TOOLS_VERSION "0.5.0"

diff --git a/percona-server-mongodb-6.0/Dockerfile.ubi8 b/percona-server-mongodb-6.0/Dockerfile.ubi8
@@ -2,7 +2,7 @@ FROM redhat/ubi8-minimal
 
 LABEL org.opencontainers.image.authors="info@percona.com"
 
-ENV PSMDB_VERSION 6.0.16-13
+ENV PSMDB_VERSION 6.0.17-14
 ENV OS_VER el8
 ENV FULL_PERCONA_VERSION "$PSMDB_VERSION.$OS_VER"
 ENV K8S_TOOLS_VERSION "0.5.0"

diff --git a/percona-server-mongodb-6.0/Dockerfile.ubi9 b/percona-server-mongodb-6.0/Dockerfile.ubi9
@@ -2,7 +2,7 @@ FROM redhat/ubi9-minimal
 
 LABEL org.opencontainers.image.authors="info@percona.com"
 
-ENV PSMDB_VERSION 6.0.16-13
+ENV PSMDB_VERSION 6.0.17-14
 ENV OS_VER el9
 ENV FULL_PERCONA_VERSION "$PSMDB_VERSION.$OS_VER"
 ENV K8S_TOOLS_VERSION "0.5.0"

diff --git a/percona-xtradb-cluster-8.0-backup/Dockerfile b/percona-xtradb-cluster-8.0-backup/Dockerfile
@@ -14,10 +14,10 @@ LABEL org.opencontainers.image.description="Percona XtraDB Cluster is a high ava
  helps enterprises avoid downtime and outages and meet expected customer experience."
 LABEL org.opencontainers.image.license="GPL"
 
-ENV PXB_VERSION=8.0.35-30.1
-ENV PS_VERSION=8.0.36-28.1
+ENV PXB_VERSION=8.0.35-31.1
+ENV PS_VERSION=8.0.37-29.1
 
-ENV PXC_VERSION=8.0.36-28.1
+ENV PXC_VERSION=8.0.37-29.1
 ENV PXC_REPO=release
 
 ENV KUBECTL_VERSION=v1.30.2

diff --git a/percona-xtradb-cluster-8.0/Dockerfile b/percona-xtradb-cluster-8.0/Dockerfile
@@ -9,7 +9,7 @@ FROM redhat/ubi8-minimal
 LABEL org.opencontainers.image.authors="info@percona.com"
 
 ENV PXC_VERSION 8.0.37-29.1
-ENV PXC_REPO testing
+ENV PXC_REPO release
 ENV OS_VER el8
 ENV FULL_PERCONA_XTRADBCLUSTER_VERSION "$PXC_VERSION.$OS_VER"
 ENV PXC_TELEMETRY_VERSION 8.0.37-29-1

diff --git a/proxysql/Dockerfile b/proxysql/Dockerfile
@@ -22,7 +22,7 @@ All the while getting the unlimited freedom that comes with a GPL license."
 LABEL org.opencontainers.image.license="GPL+"
 LABEL org.opencontainers.image.authors="info@percona.com"
 
-ENV PXC_VERSION 8.0.36-28.1
+ENV PXC_VERSION 8.0.37-29.1
 ENV PROXYSQL_VERSION 2.6.5-1.1
 ENV OS_VER el9
 ENV FULL_PERCONA_VERSION "$PXC_VERSION.$OS_VER"