Update mysql #16695
Merged
Update mysql #16695
Conversation
This file contains 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
This comment has been minimized.
This comment has been minimized.
LaurentGoderre
previously approved these changes
Apr 30, 2024
-ENV MYSQL_SHELL_VERSION 8.3.0-1.el8
+ENV MYSQL_SHELL_VERSION 8.4.0-1.el8Perhaps we need to revert that? Or maybe need to solve 8.4 lts first (docker-library/mysql#1046) |
|
@yosifkit yeah! good call! |
docker-library-bot
force-pushed
the
mysql
branch
from
7616996
to
be6814c
Compare
This comment has been minimized.
This comment has been minimized.
-mysql:8Oh. Oops. (The gordian knot continues.) |
Changes: - docker-library/mysql@9f0f4a1: Add plain 8 aliases - docker-library/mysql@d972901: Merge pull request docker-library/mysql#1046 from jnoordsij/add-8.4 - docker-library/mysql@784047f: Skip "innovation" when any other release is newer - docker-library/mysql@53973fa: Add lts alias - docker-library/mysql@c054224: Add 8.4 variant (new LTS) - docker-library/mysql@e3c2853: Update toolsRepo detection in versions.sh - docker-library/mysql@2319f17: Update innovation to mysql-shell 8.4.0-1.el8 - docker-library/mysql@5fe2b70: Update 8.0 to 8.0.37, debian 8.0.37-1debian12, mysql-shell 8.0.37-1.el8, oracle 8.0.37-1.el8
docker-library-bot
force-pushed
the
mysql
branch
from
be6814c
to
35493c0
Compare
|
Diff for 35493c0:diff --git a/_bashbrew-cat b/_bashbrew-cat
index aa0a58a..8269dd6 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.36, 8.0, 8.0.36-oraclelinux8, 8.0-oraclelinux8, 8.0.36-oracle, 8.0-oracle
+Tags: 8.0.37, 8.0, 8.0.37-oraclelinux8, 8.0-oraclelinux8, 8.0.37-oracle, 8.0-oracle
Architectures: amd64, arm64v8
-GitCommit: 831e58702aa316b69cdfaa115fc134bfede4c418
+GitCommit: 5fe2b708e9734809d7f6554c131f0371d517bb22
Directory: 8.0
File: Dockerfile.oracle
-Tags: 8.0.36-bookworm, 8.0-bookworm, 8.0.36-debian, 8.0-debian
-GitCommit: 831e58702aa316b69cdfaa115fc134bfede4c418
+Tags: 8.0.37-bookworm, 8.0-bookworm, 8.0.37-debian, 8.0-debian
+GitCommit: 5fe2b708e9734809d7f6554c131f0371d517bb22
Directory: 8.0
File: Dockerfile.debian
-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
+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
Architectures: amd64, arm64v8
-GitCommit: 831e58702aa316b69cdfaa115fc134bfede4c418
-Directory: innovation
+GitCommit: c05422492215b3f0602409288c868ee4fd606ac3
+Directory: 8.4
File: Dockerfile.oracle
diff --git a/_bashbrew-list b/_bashbrew-list
index a722840..d10be46 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -6,20 +6,20 @@ mysql:8.0-bookworm
mysql:8.0-debian
mysql:8.0-oracle
mysql:8.0-oraclelinux8
-mysql:8.0.36
-mysql:8.0.36-bookworm
-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
+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.4
+mysql:8.4-oracle
+mysql:8.4-oraclelinux8
+mysql:8.4.0
+mysql:8.4.0-oracle
+mysql:8.4.0-oraclelinux8
mysql:latest
+mysql:lts
+mysql:lts-oracle
+mysql:lts-oraclelinux8
mysql:oracle
mysql:oraclelinux8
diff --git a/mysql_8.0-debian/Dockerfile.debian b/mysql_8.0-debian/Dockerfile.debian
index 012452c..db6808d 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.36-1debian12
+ENV MYSQL_VERSION 8.0.37-1debian12
RUN echo 'deb [ signed-by=/etc/apt/keyrings/mysql.gpg ] http://repo.mysql.com/apt/debian/ bookworm 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 ded883d..052bad5 100644
--- a/mysql_8.0-oracle/Dockerfile.oracle
+++ b/mysql_8.0-oracle/Dockerfile.oracle
@@ -56,7 +56,7 @@ RUN set -eux; \
rm -rf "$GNUPGHOME"
ENV MYSQL_MAJOR 8.0
-ENV MYSQL_VERSION 8.0.36-1.el8
+ENV MYSQL_VERSION 8.0.37-1.el8
RUN set -eu; \
{ \
@@ -107,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.36-1.el8
+ENV MYSQL_SHELL_VERSION 8.0.37-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 ec92df6..c4ff961 100644
--- a/mysql_oracle/Dockerfile.oracle
+++ b/mysql_oracle/Dockerfile.oracle
@@ -55,15 +55,15 @@ RUN set -eux; \
gpg --batch --export --armor "$key" > /etc/pki/rpm-gpg/RPM-GPG-KEY-mysql; \
rm -rf "$GNUPGHOME"
-ENV MYSQL_MAJOR innovation
-ENV MYSQL_VERSION 8.3.0-1.el8
+ENV MYSQL_MAJOR 8.4
+ENV MYSQL_VERSION 8.4.0-1.el8
RUN set -eu; \
{ \
- echo '[mysqlinnovation-server-minimal]'; \
- echo 'name=MySQL innovation Server Minimal'; \
+ echo '[mysql8.4-server-minimal]'; \
+ echo 'name=MySQL 8.4 Server Minimal'; \
echo 'enabled=1'; \
- echo 'baseurl=https://repo.mysql.com/yum/mysql-innovation-community/docker/el/8/$basearch/'; \
+ echo 'baseurl=https://repo.mysql.com/yum/mysql-8.4-community/docker/el/8/$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-innovation-community/el/8/$basearch/'; \
+ echo 'baseurl=https://repo.mysql.com/yum/mysql-tools-8.4-community/el/8/$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.3.0-1.el8
+ENV MYSQL_SHELL_VERSION 8.4.0-1.el8
RUN set -eux; \
microdnf install -y "mysql-shell-$MYSQL_SHELL_VERSION"; \
microdnf clean all; \Relevant Maintainers: |
|
Relevant to docker-library/mysql#1046 (comment), I think some of these can update to OL9, but I don't think we need to do that here. |
tianon
approved these changes
Apr 30, 2024
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: