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

Merged
merged 1 commit into from
May 6, 2024
Merged

Update mysql #16708

merged 1 commit into from
May 6, 2024

Conversation

tianon
Copy link
Member

@tianon tianon commented May 2, 2024

Changes:

Changes:

- docker-library/mysql@e384941: Merge pull request docker-library/mysql#1047 from jnoordsij/oraclelinux9
- docker-library/mysql@a15b34a: Use Oracle Linux 9 as base image
@tianon tianon requested a review from a team as a code owner May 2, 2024 00:02
Copy link

github-actions bot commented May 2, 2024

Diff for ccb58da:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 8269dd6..3ba4c33 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,9 +1,9 @@
 Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit)
 GitRepo: https://github.com/docker-library/mysql.git
 
-Tags: 8.0.37, 8.0, 8.0.37-oraclelinux8, 8.0-oraclelinux8, 8.0.37-oracle, 8.0-oracle
+Tags: 8.0.37, 8.0, 8.0.37-oraclelinux9, 8.0-oraclelinux9, 8.0.37-oracle, 8.0-oracle
 Architectures: amd64, arm64v8
-GitCommit: 5fe2b708e9734809d7f6554c131f0371d517bb22
+GitCommit: a15b34a032f48089ee7b02d307d8f89a96b3bb76
 Directory: 8.0
 File: Dockerfile.oracle
 
@@ -12,8 +12,8 @@ GitCommit: 5fe2b708e9734809d7f6554c131f0371d517bb22
 Directory: 8.0
 File: Dockerfile.debian
 
-Tags: 8.4.0, 8.4, 8, lts, latest, 8.4.0-oraclelinux8, 8.4-oraclelinux8, 8-oraclelinux8, lts-oraclelinux8, oraclelinux8, 8.4.0-oracle, 8.4-oracle, 8-oracle, lts-oracle, oracle
+Tags: 8.4.0, 8.4, 8, lts, latest, 8.4.0-oraclelinux9, 8.4-oraclelinux9, 8-oraclelinux9, lts-oraclelinux9, oraclelinux9, 8.4.0-oracle, 8.4-oracle, 8-oracle, lts-oracle, oracle
 Architectures: amd64, arm64v8
-GitCommit: c05422492215b3f0602409288c868ee4fd606ac3
+GitCommit: a15b34a032f48089ee7b02d307d8f89a96b3bb76
 Directory: 8.4
 File: Dockerfile.oracle
diff --git a/_bashbrew-list b/_bashbrew-list
index d10be46..4450864 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,25 +1,25 @@
 mysql:8
 mysql:8-oracle
-mysql:8-oraclelinux8
+mysql:8-oraclelinux9
 mysql:8.0
 mysql:8.0-bookworm
 mysql:8.0-debian
 mysql:8.0-oracle
-mysql:8.0-oraclelinux8
+mysql:8.0-oraclelinux9
 mysql:8.0.37
 mysql:8.0.37-bookworm
 mysql:8.0.37-debian
 mysql:8.0.37-oracle
-mysql:8.0.37-oraclelinux8
+mysql:8.0.37-oraclelinux9
 mysql:8.4
 mysql:8.4-oracle
-mysql:8.4-oraclelinux8
+mysql:8.4-oraclelinux9
 mysql:8.4.0
 mysql:8.4.0-oracle
-mysql:8.4.0-oraclelinux8
+mysql:8.4.0-oraclelinux9
 mysql:latest
 mysql:lts
 mysql:lts-oracle
-mysql:lts-oraclelinux8
+mysql:lts-oraclelinux9
 mysql:oracle
-mysql:oraclelinux8
+mysql:oraclelinux9
diff --git a/mysql_8.0-oracle/Dockerfile.oracle b/mysql_8.0-oracle/Dockerfile.oracle
index 052bad5..d872b66 100644
--- a/mysql_8.0-oracle/Dockerfile.oracle
+++ b/mysql_8.0-oracle/Dockerfile.oracle
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM oraclelinux:8-slim
+FROM oraclelinux:9-slim
 
 RUN set -eux; \
 	groupadd --system --gid 999 mysql; \
@@ -56,14 +56,14 @@ RUN set -eux; \
 	rm -rf "$GNUPGHOME"
 
 ENV MYSQL_MAJOR 8.0
-ENV MYSQL_VERSION 8.0.37-1.el8
+ENV MYSQL_VERSION 8.0.37-1.el9
 
 RUN set -eu; \
 	{ \
 		echo '[mysql8.0-server-minimal]'; \
 		echo 'name=MySQL 8.0 Server Minimal'; \
 		echo 'enabled=1'; \
-		echo 'baseurl=https://repo.mysql.com/yum/mysql-8.0-community/docker/el/8/$basearch/'; \
+		echo 'baseurl=https://repo.mysql.com/yum/mysql-8.0-community/docker/el/9/$basearch/'; \
 		echo 'gpgcheck=1'; \
 		echo 'gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql'; \
 # https://github.com/docker-library/mysql/pull/680#issuecomment-825930524
@@ -100,14 +100,14 @@ RUN set -eu; \
 	{ \
 		echo '[mysql-tools-community]'; \
 		echo 'name=MySQL Tools Community'; \
-		echo 'baseurl=https://repo.mysql.com/yum/mysql-tools-community/el/8/$basearch/'; \
+		echo 'baseurl=https://repo.mysql.com/yum/mysql-tools-community/el/9/$basearch/'; \
 		echo 'enabled=1'; \
 		echo 'gpgcheck=1'; \
 		echo 'gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql'; \
 # 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.37-1.el8
+ENV MYSQL_SHELL_VERSION 8.0.37-1.el9
 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 c4ff961..607f9c5 100644
--- a/mysql_oracle/Dockerfile.oracle
+++ b/mysql_oracle/Dockerfile.oracle
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM oraclelinux:8-slim
+FROM oraclelinux:9-slim
 
 RUN set -eux; \
 	groupadd --system --gid 999 mysql; \
@@ -56,14 +56,14 @@ RUN set -eux; \
 	rm -rf "$GNUPGHOME"
 
 ENV MYSQL_MAJOR 8.4
-ENV MYSQL_VERSION 8.4.0-1.el8
+ENV MYSQL_VERSION 8.4.0-1.el9
 
 RUN set -eu; \
 	{ \
 		echo '[mysql8.4-server-minimal]'; \
 		echo 'name=MySQL 8.4 Server Minimal'; \
 		echo 'enabled=1'; \
-		echo 'baseurl=https://repo.mysql.com/yum/mysql-8.4-community/docker/el/8/$basearch/'; \
+		echo 'baseurl=https://repo.mysql.com/yum/mysql-8.4-community/docker/el/9/$basearch/'; \
 		echo 'gpgcheck=1'; \
 		echo 'gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql'; \
 # https://github.com/docker-library/mysql/pull/680#issuecomment-825930524
@@ -100,14 +100,14 @@ RUN set -eu; \
 	{ \
 		echo '[mysql-tools-community]'; \
 		echo 'name=MySQL Tools Community'; \
-		echo 'baseurl=https://repo.mysql.com/yum/mysql-tools-8.4-community/el/8/$basearch/'; \
+		echo 'baseurl=https://repo.mysql.com/yum/mysql-tools-8.4-community/el/9/$basearch/'; \
 		echo 'enabled=1'; \
 		echo 'gpgcheck=1'; \
 		echo 'gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql'; \
 # 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.4.0-1.el8
+ENV MYSQL_SHELL_VERSION 8.4.0-1.el9
 RUN set -eux; \
 	microdnf install -y "mysql-shell-$MYSQL_SHELL_VERSION"; \
 	microdnf clean all; \

Relevant Maintainers:

@yosifkit
Copy link
Member

yosifkit commented May 2, 2024

🤔 we should wait until Monday on this Oracle Linux 8 to 9 bump, just in case there are user issues.

@tianon tianon merged commit e822036 into docker-library:master May 6, 2024
8 checks passed
@tianon tianon deleted the mysql branch May 6, 2024 16:33
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