Update mysql - #21385
Merged
Merged
Conversation
Changes: - docker-library/mysql@15c936e: Merge pull request docker-library/mysql#1140 from jnoordsij/8.0-eol
Diff for 0bee242:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 2cb0d1f..25d5383 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,25 +1,14 @@
Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon), Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
GitRepo: https://github.com/docker-library/mysql.git
-Tags: 8.0.46, 8.0, 8.0.46-oraclelinux9, 8.0-oraclelinux9, 8.0.46-oracle, 8.0-oracle
-Architectures: amd64, arm64v8
-GitCommit: 7cf11d5360282effadb347353d5f82339506b106
-Directory: 8.0
-File: Dockerfile.oracle
-
-Tags: 8.0.46-bookworm, 8.0-bookworm, 8.0.46-debian, 8.0-debian
-GitCommit: 7cf11d5360282effadb347353d5f82339506b106
-Directory: 8.0
-File: Dockerfile.debian
-
Tags: 8.4.9, 8.4, 8, 8.4.9-oraclelinux9, 8.4-oraclelinux9, 8-oraclelinux9, 8.4.9-oracle, 8.4-oracle, 8-oracle
Architectures: amd64, arm64v8
-GitCommit: 7fcf7198cf8be286bae76a4b587ac206af3e7cd8
+GitCommit: f59266f3ec6f1ddfc66d1db613430d9dcc52419b
Directory: 8.4
File: Dockerfile.oracle
Tags: 9.7.0, 9.7, 9, lts, latest, 9.7.0-oraclelinux9, 9.7-oraclelinux9, 9-oraclelinux9, lts-oraclelinux9, oraclelinux9, 9.7.0-oracle, 9.7-oracle, 9-oracle, lts-oracle, oracle
Architectures: amd64, arm64v8
-GitCommit: 42686d1c1bba5b1e4f332ef802fdabc8fedae1a7
+GitCommit: f59266f3ec6f1ddfc66d1db613430d9dcc52419b
Directory: 9.7
File: Dockerfile.oracle
diff --git a/_bashbrew-list b/_bashbrew-list
index eee0306..43d06f1 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,16 +1,6 @@
mysql:8
mysql:8-oracle
mysql:8-oraclelinux9
-mysql:8.0
-mysql:8.0-bookworm
-mysql:8.0-debian
-mysql:8.0-oracle
-mysql:8.0-oraclelinux9
-mysql:8.0.46
-mysql:8.0.46-bookworm
-mysql:8.0.46-debian
-mysql:8.0.46-oracle
-mysql:8.0.46-oraclelinux9
mysql:8.4
mysql:8.4-oracle
mysql:8.4-oraclelinux9
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index ed36f43..0c813df 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,4 +1,2 @@
mysql:8-oracle
-mysql:8.0-debian
-mysql:8.0-oracle
mysql:oracle
diff --git a/mysql_8-oracle/Dockerfile.oracle b/mysql_8-oracle/Dockerfile.oracle
index 0ea3497..7ba6ae8 100644
--- a/mysql_8-oracle/Dockerfile.oracle
+++ b/mysql_8-oracle/Dockerfile.oracle
@@ -44,7 +44,7 @@ RUN set -eux; \
microdnf clean all
RUN set -eux; \
-# https://dev.mysql.com/doc/refman/8.0/en/checking-gpg-signature.html
+# https://dev.mysql.com/doc/refman/9.7/en/checking-gpg-signature.html
# 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>
diff --git a/mysql_8-oracle/docker-entrypoint.sh b/mysql_8-oracle/docker-entrypoint.sh
index 0927b5f..884774a 100755
--- a/mysql_8-oracle/docker-entrypoint.sh
+++ b/mysql_8-oracle/docker-entrypoint.sh
@@ -214,8 +214,7 @@ docker_create_db_directories() {
# initializes the database directory
docker_init_database_dir() {
mysql_note "Initializing database files"
- "$@" --initialize-insecure --default-time-zone=SYSTEM --autocommit=1
- # explicitly enable autocommit to combat https://bugs.mysql.com/bug.php?id=110535 (TODO remove this when 8.0 is EOL; see https://github.com/mysql/mysql-server/commit/7dbf4f80ed15f3c925cfb2b834142f23a2de719a)
+ "$@" --initialize-insecure --default-time-zone=SYSTEM
mysql_note "Database files initialized"
}
diff --git a/mysql_8.0-debian/Dockerfile.debian b/mysql_8.0-debian/Dockerfile.debian
deleted file mode 100644
index 743dd55..0000000
diff --git a/mysql_8.0-debian/config/conf.d/docker.cnf b/mysql_8.0-debian/config/conf.d/docker.cnf
deleted file mode 100644
index 205bedb..0000000
diff --git a/mysql_8.0-debian/config/my.cnf b/mysql_8.0-debian/config/my.cnf
deleted file mode 100644
index 1f2511c..0000000
diff --git a/mysql_8.0-debian/docker-entrypoint.sh b/mysql_8.0-debian/docker-entrypoint.sh
deleted file mode 100755
index 0927b5f..0000000
diff --git a/mysql_8.0-oracle/Dockerfile.oracle b/mysql_8.0-oracle/Dockerfile.oracle
deleted file mode 100644
index 6c6e12b..0000000
diff --git a/mysql_8.0-oracle/docker-entrypoint.sh b/mysql_8.0-oracle/docker-entrypoint.sh
deleted file mode 100755
index 0927b5f..0000000
diff --git a/mysql_oracle/Dockerfile.oracle b/mysql_oracle/Dockerfile.oracle
index a7535e8..11037df 100644
--- a/mysql_oracle/Dockerfile.oracle
+++ b/mysql_oracle/Dockerfile.oracle
@@ -44,7 +44,7 @@ RUN set -eux; \
microdnf clean all
RUN set -eux; \
-# https://dev.mysql.com/doc/refman/8.0/en/checking-gpg-signature.html
+# https://dev.mysql.com/doc/refman/9.7/en/checking-gpg-signature.html
# 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>
diff --git a/mysql_oracle/docker-entrypoint.sh b/mysql_oracle/docker-entrypoint.sh
index 0927b5f..884774a 100755
--- a/mysql_oracle/docker-entrypoint.sh
+++ b/mysql_oracle/docker-entrypoint.sh
@@ -214,8 +214,7 @@ docker_create_db_directories() {
# initializes the database directory
docker_init_database_dir() {
mysql_note "Initializing database files"
- "$@" --initialize-insecure --default-time-zone=SYSTEM --autocommit=1
- # explicitly enable autocommit to combat https://bugs.mysql.com/bug.php?id=110535 (TODO remove this when 8.0 is EOL; see https://github.com/mysql/mysql-server/commit/7dbf4f80ed15f3c925cfb2b834142f23a2de719a)
+ "$@" --initialize-insecure --default-time-zone=SYSTEM
mysql_note "Database files initialized"
}Relevant Maintainers: |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changes: