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

Update mysql #16088

Merged
merged 1 commit into from
Jan 18, 2024
Merged

Update mysql #16088

merged 1 commit into from
Jan 18, 2024

Conversation

tianon
Copy link
Member

@tianon tianon commented Jan 18, 2024

Changes:

Changes:

- docker-library/mysql@d50feaa: Merge pull request docker-library/mysql#1024 from infosiftr/pgp-redux
- docker-library/mysql@b602999: Update GHA YAML with bashbrew example improvements (esp. concurrency:)
- docker-library/mysql@ffa6423: Update to 8.0.36 and 8.3.0 (and update RPM repo PGP key)
- docker-library/mysql@c0c45e2: Merge pull request docker-library/mysql#1020 from infosiftr/template-move
- docker-library/mysql@d65c7ea: Fix gitattributes file
Copy link

Diff for 84fdf5d:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index aad4e39..11c55f7 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,19 +1,19 @@
 Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon), Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
 GitRepo: https://github.com/docker-library/mysql.git
 
-Tags: 8.0.35, 8.0, 8.0.35-oraclelinux8, 8.0-oraclelinux8, 8.0.35-oracle, 8.0-oracle
+Tags: 8.0.36, 8.0, 8.0.36-oraclelinux8, 8.0-oraclelinux8, 8.0.36-oracle, 8.0-oracle
 Architectures: amd64, arm64v8
-GitCommit: 3e959c224b965b0dd92a59a1dedeb7c34a24f550
+GitCommit: ffa6423ca24168e4d96631b5e8f536ac826d2a5b
 Directory: 8.0
 File: Dockerfile.oracle
 
-Tags: 8.0.35-bullseye, 8.0-bullseye, 8.0.35-debian, 8.0-debian
-GitCommit: 3e959c224b965b0dd92a59a1dedeb7c34a24f550
+Tags: 8.0.36-bullseye, 8.0-bullseye, 8.0.36-debian, 8.0-debian
+GitCommit: ffa6423ca24168e4d96631b5e8f536ac826d2a5b
 Directory: 8.0
 File: Dockerfile.debian
 
-Tags: 8.2.0, 8.2, 8, innovation, latest, 8.2.0-oraclelinux8, 8.2-oraclelinux8, 8-oraclelinux8, innovation-oraclelinux8, oraclelinux8, 8.2.0-oracle, 8.2-oracle, 8-oracle, innovation-oracle, oracle
+Tags: 8.3.0, 8.3, 8, innovation, latest, 8.3.0-oraclelinux8, 8.3-oraclelinux8, 8-oraclelinux8, innovation-oraclelinux8, oraclelinux8, 8.3.0-oracle, 8.3-oracle, 8-oracle, innovation-oracle, oracle
 Architectures: amd64, arm64v8
-GitCommit: 3e959c224b965b0dd92a59a1dedeb7c34a24f550
+GitCommit: ffa6423ca24168e4d96631b5e8f536ac826d2a5b
 Directory: innovation
 File: Dockerfile.oracle
diff --git a/_bashbrew-list b/_bashbrew-list
index 4edaebb..d4eb20e 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -6,17 +6,17 @@ mysql:8.0-bullseye
 mysql:8.0-debian
 mysql:8.0-oracle
 mysql:8.0-oraclelinux8
-mysql:8.0.35
-mysql:8.0.35-bullseye
-mysql:8.0.35-debian
-mysql:8.0.35-oracle
-mysql:8.0.35-oraclelinux8
-mysql:8.2
-mysql:8.2-oracle
-mysql:8.2-oraclelinux8
-mysql:8.2.0
-mysql:8.2.0-oracle
-mysql:8.2.0-oraclelinux8
+mysql:8.0.36
+mysql:8.0.36-bullseye
+mysql:8.0.36-debian
+mysql:8.0.36-oracle
+mysql:8.0.36-oraclelinux8
+mysql:8.3
+mysql:8.3-oracle
+mysql:8.3-oraclelinux8
+mysql:8.3.0
+mysql:8.3.0-oracle
+mysql:8.3.0-oraclelinux8
 mysql:innovation
 mysql:innovation-oracle
 mysql:innovation-oraclelinux8
diff --git a/mysql_8.0-debian/Dockerfile.debian b/mysql_8.0-debian/Dockerfile.debian
index c231d2d..ad0cd3a 100644
--- a/mysql_8.0-debian/Dockerfile.debian
+++ b/mysql_8.0-debian/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/mysql_8.0-oracle/Dockerfile.oracle b/mysql_8.0-oracle/Dockerfile.oracle
index 0bc9653..585210e 100644
--- a/mysql_8.0-oracle/Dockerfile.oracle
+++ b/mysql_8.0-oracle/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 <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; \
 	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/mysql_oracle/Dockerfile.oracle b/mysql_oracle/Dockerfile.oracle
index 334a3d0..073de11 100644
--- a/mysql_oracle/Dockerfile.oracle
+++ b/mysql_oracle/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 <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; \
 	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; \

Relevant Maintainers:

@yosifkit yosifkit merged commit 9dc908c into docker-library:master Jan 18, 2024
8 checks passed
@yosifkit yosifkit deleted the mysql branch January 18, 2024 23:24
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.

3 participants