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 #15925

Merged
merged 1 commit into from
Dec 16, 2023
Merged

Update mysql #15925

merged 1 commit into from
Dec 16, 2023

Conversation

yosifkit
Copy link
Member

Changes:

Changes:

- docker-library/mysql@3728e57: Merge pull request docker-library/mysql#1018 from infosiftr/new-key
- docker-library/mysql@d035567: Add new upstream gpg key for Debian packages
- docker-library/mysql@c4a7f36: Merge pull request docker-library/mysql#981 from infosiftr/suite-aliases
Copy link

Diff for f8af768:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index bb712f6..336286d 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,23 +1,23 @@
 Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit)
 GitRepo: https://github.com/docker-library/mysql.git
 
-Tags: 5.7.44, 5.7, 5, 5.7.44-oracle, 5.7-oracle, 5-oracle
+Tags: 5.7.44, 5.7, 5, 5.7.44-oraclelinux7, 5.7-oraclelinux7, 5-oraclelinux7, 5.7.44-oracle, 5.7-oracle, 5-oracle
 GitCommit: 0097ab8a1fde788a9a51357339fa5498855623e2
 Directory: 5.7
 File: Dockerfile.oracle
 
-Tags: 8.0.35, 8.0, 8.0.35-oracle, 8.0-oracle
+Tags: 8.0.35, 8.0, 8.0.35-oraclelinux8, 8.0-oraclelinux8, 8.0.35-oracle, 8.0-oracle
 Architectures: amd64, arm64v8
 GitCommit: 0097ab8a1fde788a9a51357339fa5498855623e2
 Directory: 8.0
 File: Dockerfile.oracle
 
-Tags: 8.0.35-debian, 8.0-debian
-GitCommit: dc35beded3a41c4c62dfaa7f86ea5721c02a2e8b
+Tags: 8.0.35-bullseye, 8.0-bullseye, 8.0.35-debian, 8.0-debian
+GitCommit: d035567ee66d525cbf95b8dbc0be20e2f0a5e3f5
 Directory: 8.0
 File: Dockerfile.debian
 
-Tags: 8.2.0, 8.2, 8, innovation, latest, 8.2.0-oracle, 8.2-oracle, 8-oracle, innovation-oracle, oracle
+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
 Architectures: amd64, arm64v8
 GitCommit: 0097ab8a1fde788a9a51357339fa5498855623e2
 Directory: innovation
diff --git a/_bashbrew-list b/_bashbrew-list
index fda596c..59ad63d 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,22 +1,34 @@
 mysql:5
 mysql:5-oracle
+mysql:5-oraclelinux7
 mysql:5.7
 mysql:5.7-oracle
+mysql:5.7-oraclelinux7
 mysql:5.7.44
 mysql:5.7.44-oracle
+mysql:5.7.44-oraclelinux7
 mysql:8
 mysql:8-oracle
+mysql:8-oraclelinux8
 mysql:8.0
+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:innovation
 mysql:innovation-oracle
+mysql:innovation-oraclelinux8
 mysql:latest
 mysql:oracle
+mysql:oraclelinux8
diff --git a/mysql_8.0-debian/Dockerfile.debian b/mysql_8.0-debian/Dockerfile.debian
index dd18532..c231d2d 100644
--- a/mysql_8.0-debian/Dockerfile.debian
+++ b/mysql_8.0-debian/Dockerfile.debian
@@ -53,8 +53,11 @@ RUN set -eux; \
 	rm -rf /var/lib/apt/lists/*
 
 RUN set -eux; \
-# gpg: key 3A79BD29: public key "MySQL Release Engineering <[email protected]>" 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 <[email protected]>
+# 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"; \
 	mkdir -p /etc/apt/keyrings; \

Relevant Maintainers:

@tianon tianon merged commit 0f63eb6 into docker-library:master Dec 16, 2023
9 checks passed
@tianon tianon deleted the mysql branch December 16, 2023 00:23
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