Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[percona] update ps-80 version #18180

Merged
merged 2 commits into from
Jan 8, 2025
Merged

Conversation

adivinho
Copy link
Contributor

@adivinho adivinho commented Jan 2, 2025

No description provided.

@adivinho adivinho requested a review from a team as a code owner January 2, 2025 13:58

This comment has been minimized.

@tianon
Copy link
Member

tianon commented Jan 7, 2025

+    curl -O https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-9; \
+    rpm --import RPM-GPG-KEY-EPEL-9; \

This key needs to be verified/exported via full fingerprint or checksum in some way like the keys above (in the same Dockerfile).

Copy link

github-actions bot commented Jan 8, 2025

Diff for 372c711:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index a375d73..c9ccade 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,8 +2,8 @@ Maintainers: Evgeniy Patlan <[email protected]> (@EvgeniyPatlan), Viach
 GitRepo: https://github.com/percona/percona-docker.git
 GitFetch: refs/heads/main
 
-Tags: 8.0.39-30-centos, 8.0-centos, 8-centos, 8.0.39-30, 8.0, 8, ps-8.0.39-30, ps-8.0, ps-8
-GitCommit: 5640bc536e5ce7d1559fc4f28868fda941bbaf1d
+Tags: 8.0.40-31-centos, 8.0-centos, 8-centos, 8.0.40-31, 8.0, 8, ps-8.0.40-31, ps-8.0, ps-8
+GitCommit: aa29ac7b58f30ad459cbee36d5f1ad0891d5a0f4
 Directory: percona-server-8.0
 File: Dockerfile-dockerhub
 
diff --git a/_bashbrew-list b/_bashbrew-list
index 6727a23..e442f40 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -2,8 +2,8 @@ percona:8
 percona:8-centos
 percona:8.0
 percona:8.0-centos
-percona:8.0.39-30
-percona:8.0.39-30-centos
+percona:8.0.40-31
+percona:8.0.40-31-centos
 percona:psmdb-5.0
 percona:psmdb-5.0.29
 percona:psmdb-6.0
@@ -12,4 +12,4 @@ percona:psmdb-7.0
 percona:psmdb-7.0.15
 percona:ps-8
 percona:ps-8.0
-percona:ps-8.0.39-30
+percona:ps-8.0.40-31
diff --git a/percona_ps-8/Dockerfile-dockerhub b/percona_ps-8/Dockerfile-dockerhub
index a335ebe..17cdb58 100644
--- a/percona_ps-8/Dockerfile-dockerhub
+++ b/percona_ps-8/Dockerfile-dockerhub
@@ -3,27 +3,28 @@
 # https://github.com/docker-library/official-images:
 # No official images can be derived from, or depend on, non-official images
 # with the following notable exceptions...
-FROM oraclelinux:9
+FROM redhat/ubi9-minimal
 
 LABEL org.opencontainers.image.authors="[email protected]"
 
 # It is intentionally used another UID, to have backward compatibility with
 # the previous image versions published on Docker Hub
 RUN set -ex; \
-    groupdel input; \
-    userdel systemd-coredump; \
+    #groupdel input; \
+    #userdel systemd-coredump; \
     groupadd -g 1001 mysql; \
     useradd -u 1001 -r -g 1001 -s /sbin/nologin \
         -m -c "Default Application User" mysql
 
-ENV PS_VERSION 8.0.39-30.1
-ENV MYSQL_SHELL_VERSION 8.0.38-1
+ENV PS_VERSION 8.0.40-31.1
+ENV MYSQL_SHELL_VERSION 8.0.40-1
 ENV OS_VER el9
 ENV FULL_PERCONA_VERSION "$PS_VERSION.$OS_VER"
 ENV FULL_MYSQL_SHELL_VERSION "$MYSQL_SHELL_VERSION.$OS_VER"
 ENV PS_REPO testing
-ENV PS_TELEMETRY_VERSION 8.0.39-30-1
+ENV PS_TELEMETRY_VERSION 8.0.40-31-1
 ENV CALL_HOME_DOWNLOAD_SHA256 5e84d2f1a5d57f44c46e6a1f16794d649d3de09fe8021f0294bc321c89e51068
+ENV KEY_RPM_DOWNLOAD_SHA256 fcf0eab4f05a1c0de6363ac4b707600a27a9d774e9b491059e59e6921b255a84
 ENV CALL_HOME_VERSION 0.1
 # Do not report during Docker image creation.
 # Note that doing so, would create telemetry config file
@@ -41,17 +42,27 @@ RUN set -ex; \
     rpmkeys --import ${GNUPGHOME}/PERCONA-PACKAGING-KEY ${GNUPGHOME}/RPM-GPG-KEY-centosofficial; \
     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; \
     percona-release disable all; \
     percona-release enable ps-80 ${PS_REPO}; \
-    percona-release enable mysql-shell ${PS_REPO}
+    percona-release enable mysql-shell ${PS_REPO}; \
+    curl -O https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-9; \
+    echo "$KEY_RPM_DOWNLOAD_SHA256 RPM-GPG-KEY-EPEL-9" | sha256sum --strict --check; \
+    rpm --import RPM-GPG-KEY-EPEL-9; \
+    curl -Lf -o /tmp/jemalloc.rpm https://rpmfind.net/linux/epel/9/Everything/x86_64/Packages/j/jemalloc-5.2.1-2.el9.x86_64.rpm; \
+    curl -Lf -o /tmp/gflags.rpm https://rpmfind.net/linux/epel/9/Everything/x86_64/Packages/g/gflags-2.2.2-9.el9.x86_64.rpm; \
+    rpmkeys --checksig /tmp/gflags.rpm /tmp/jemalloc.rpm; \
+    rpm -i /tmp/jemalloc.rpm; \
+    rpm -i /tmp/gflags.rpm; \
+    rm -f /tmp/gflags.rpm /tmp/jemalloc.rpm
 
 RUN set -ex; \
-    dnf -y install epel-release; \
+    #microdnf -y install epel-release; \
     rpm -e --nodeps tzdata; \
-    dnf -y install \
+    microdnf -y install \
         hostname \
         tzdata \
         jemalloc \
@@ -59,9 +70,8 @@ RUN set -ex; \
         cracklib-dicts \
         tar \
         policycoreutils; \
-    dnf -y update \
-        curl \
-        glibc \
+    microdnf -y update \
+        #glibc \
         libnghttp2 \
         openssh \
         python3-setuptools-wheel \
@@ -69,14 +79,14 @@ RUN set -ex; \
         pam \
         python3; \
     \
-    dnf -y install \
+    microdnf -y install \
         percona-server-server-${FULL_PERCONA_VERSION} \
         #percona-server-tokudb-${FULL_PERCONA_VERSION} \
         percona-server-devel-${FULL_PERCONA_VERSION} \
         percona-server-rocksdb-${FULL_PERCONA_VERSION} \
         percona-icu-data-files-${FULL_PERCONA_VERSION} \
         percona-mysql-shell-${FULL_MYSQL_SHELL_VERSION}; \
-    dnf clean all; \
+    microdnf clean all; \
     rm -rf /var/cache/dnf /var/cache/yum /var/lib/mysql
 
 # purge and re-create /var/lib/mysql with appropriate ownership

Relevant Maintainers:

@adivinho
Copy link
Contributor Author

adivinho commented Jan 8, 2025

This key needs to be verified/exported via full fingerprint or checksum in some way like the keys above (in the same Dockerfile).

Verification has been added.

@tianon tianon merged commit 0260ba6 into docker-library:master Jan 8, 2025
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants