Merge pull request #1024 from infosiftr/pgp-redux

Update to 8.0.36 and 8.3.0 (and update RPM repo PGP key)
docker-library · Jan 18, 2024 · d50feaa · d50feaa
2 parents b602999 + ffa6423
commit d50feaa
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 18 deletions.
diff --git a/8.0/Dockerfile.debian b/8.0/Dockerfile.debian
diff --git a/8.0/Dockerfile.oracle b/8.0/Dockerfile.oracle
diff --git 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 <mysql-build@oss.oracle.com>" 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 <mysql-build@oss.oracle.com>
+# 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
diff --git a/versions.json b/versions.json
@@ -5,11 +5,11 @@
         "amd64"
       ],
       "suite": "bullseye",
-      "version": "8.0.35-1debian11"
+      "version": "8.0.36-1debian11"
     },
     "mysql-shell": {
       "repo": "https://repo.mysql.com/yum/mysql-tools-community/el/8",
-      "version": "8.0.35-1.el8"
+      "version": "8.0.36-1.el8"
     },
     "oracle": {
       "architectures": [
@@ -18,14 +18,14 @@
       ],
       "repo": "https://repo.mysql.com/yum/mysql-8.0-community/docker/el/8",
       "variant": "8-slim",
-      "version": "8.0.35-1.el8"
+      "version": "8.0.36-1.el8"
     },
-    "version": "8.0.35"
+    "version": "8.0.36"
   },
   "innovation": {
     "mysql-shell": {
       "repo": "https://repo.mysql.com/yum/mysql-tools-innovation-community/el/8",
-      "version": "8.2.1-1.el8"
+      "version": "8.3.0-1.el8"
     },
     "oracle": {
       "architectures": [
@@ -34,8 +34,8 @@
       ],
       "repo": "https://repo.mysql.com/yum/mysql-innovation-community/docker/el/8",
       "variant": "8-slim",
-      "version": "8.2.0-1.el8"
+      "version": "8.3.0-1.el8"
     },
-    "version": "8.2.0"
+    "version": "8.3.0"
   }
 }