From cab5bca2657be67a136dd830ff9c400cc561e13e Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 18 Jan 2024 09:35:29 -0800 Subject: [PATCH] Update to 8.0.36 and 8.3.0 (and update RPM repo PGP key) --- 8.0/Dockerfile.debian | 2 +- 8.0/Dockerfile.oracle | 11 +++++++---- Dockerfile.oracle | 7 +++++-- innovation/Dockerfile.oracle | 11 +++++++---- 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/8.0/Dockerfile.debian b/8.0/Dockerfile.debian index c231d2d62..ad0cd3a58 100644 --- a/8.0/Dockerfile.debian +++ b/8.0/Dockerfile.debian @@ -66,7 +66,7 @@ RUN set -eux; \ rm -rf "$GNUPGHOME" ENV MYSQL_MAJOR 8.0 -ENV MYSQL_VERSION 8.0.35-1debian11 +ENV MYSQL_VERSION 8.0.36-1debian11 RUN echo 'deb [ signed-by=/etc/apt/keyrings/mysql.gpg ] http://repo.mysql.com/apt/debian/ bullseye mysql-8.0' > /etc/apt/sources.list.d/mysql.list diff --git a/8.0/Dockerfile.oracle b/8.0/Dockerfile.oracle index 0bc9653e3..585210e17 100644 --- a/8.0/Dockerfile.oracle +++ b/8.0/Dockerfile.oracle @@ -45,15 +45,18 @@ RUN set -eux; \ RUN set -eux; \ # https://dev.mysql.com/doc/refman/8.0/en/checking-gpg-signature.html -# gpg: key 3A79BD29: public key "MySQL Release Engineering " imported - key='859BE8D7C586F538430B19C2467B942D3A79BD29'; \ +# pub rsa4096 2023-10-23 [SC] [expires: 2025-10-22] +# BCA4 3417 C3B4 85DD 128E C6D4 B7B3 B788 A8D3 785C +# uid [ unknown] MySQL Release Engineering +# sub rsa4096 2023-10-23 [E] [expires: 2025-10-22] + key='BCA4 3417 C3B4 85DD 128E C6D4 B7B3 B788 A8D3 785C'; \ export GNUPGHOME="$(mktemp -d)"; \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ gpg --batch --export --armor "$key" > /etc/pki/rpm-gpg/RPM-GPG-KEY-mysql; \ rm -rf "$GNUPGHOME" ENV MYSQL_MAJOR 8.0 -ENV MYSQL_VERSION 8.0.35-1.el8 +ENV MYSQL_VERSION 8.0.36-1.el8 RUN set -eu; \ { \ @@ -104,7 +107,7 @@ RUN set -eu; \ # https://github.com/docker-library/mysql/pull/680#issuecomment-825930524 echo 'module_hotfixes=true'; \ } | tee /etc/yum.repos.d/mysql-community-tools.repo -ENV MYSQL_SHELL_VERSION 8.0.35-1.el8 +ENV MYSQL_SHELL_VERSION 8.0.36-1.el8 RUN set -eux; \ microdnf install -y "mysql-shell-$MYSQL_SHELL_VERSION"; \ microdnf clean all; \ diff --git a/Dockerfile.oracle b/Dockerfile.oracle index 1cdb354de..12a7176dc 100644 --- a/Dockerfile.oracle +++ b/Dockerfile.oracle @@ -60,8 +60,11 @@ RUN set -eux; \ RUN set -eux; \ # https://dev.mysql.com/doc/refman/8.0/en/checking-gpg-signature.html -# gpg: key 3A79BD29: public key "MySQL Release Engineering " imported - key='859BE8D7C586F538430B19C2467B942D3A79BD29'; \ +# pub rsa4096 2023-10-23 [SC] [expires: 2025-10-22] +# BCA4 3417 C3B4 85DD 128E C6D4 B7B3 B788 A8D3 785C +# uid [ unknown] MySQL Release Engineering +# sub rsa4096 2023-10-23 [E] [expires: 2025-10-22] + key='BCA4 3417 C3B4 85DD 128E C6D4 B7B3 B788 A8D3 785C'; \ export GNUPGHOME="$(mktemp -d)"; \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ gpg --batch --export --armor "$key" > /etc/pki/rpm-gpg/RPM-GPG-KEY-mysql; \ diff --git a/innovation/Dockerfile.oracle b/innovation/Dockerfile.oracle index 334a3d00a..073de1162 100644 --- a/innovation/Dockerfile.oracle +++ b/innovation/Dockerfile.oracle @@ -45,15 +45,18 @@ RUN set -eux; \ RUN set -eux; \ # https://dev.mysql.com/doc/refman/8.0/en/checking-gpg-signature.html -# gpg: key 3A79BD29: public key "MySQL Release Engineering " imported - key='859BE8D7C586F538430B19C2467B942D3A79BD29'; \ +# pub rsa4096 2023-10-23 [SC] [expires: 2025-10-22] +# BCA4 3417 C3B4 85DD 128E C6D4 B7B3 B788 A8D3 785C +# uid [ unknown] MySQL Release Engineering +# sub rsa4096 2023-10-23 [E] [expires: 2025-10-22] + key='BCA4 3417 C3B4 85DD 128E C6D4 B7B3 B788 A8D3 785C'; \ export GNUPGHOME="$(mktemp -d)"; \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ gpg --batch --export --armor "$key" > /etc/pki/rpm-gpg/RPM-GPG-KEY-mysql; \ rm -rf "$GNUPGHOME" ENV MYSQL_MAJOR innovation -ENV MYSQL_VERSION 8.2.0-1.el8 +ENV MYSQL_VERSION 8.3.0-1.el8 RUN set -eu; \ { \ @@ -104,7 +107,7 @@ RUN set -eu; \ # https://github.com/docker-library/mysql/pull/680#issuecomment-825930524 echo 'module_hotfixes=true'; \ } | tee /etc/yum.repos.d/mysql-community-tools.repo -ENV MYSQL_SHELL_VERSION 8.2.1-1.el8 +ENV MYSQL_SHELL_VERSION 8.3.0-1.el8 RUN set -eux; \ microdnf install -y "mysql-shell-$MYSQL_SHELL_VERSION"; \ microdnf clean all; \