Update mysql #17097
Merged
Update mysql #17097
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.
Changes: - docker-library/mysql@939fe2f: Merge pull request docker-library/mysql#1076 from jnoordsij/innovation-oraclelinux9 - docker-library/mysql@3d11822: Use Oracle Linux 9 as base image for innovation image - docker-library/mysql@9585da1: Update innovation to mysql-shell 9.0.0-1.el8 - docker-library/mysql@efa7479: Update 8.4 to 8.4.1, oracle 8.4.1-1.el9, mysql-shell 8.4.1-1.el9 - docker-library/mysql@db7daba: Update 8.0 to 8.0.38, debian 8.0.38-1debian12, oracle 8.0.38-1.el9, mysql-shell 8.0.38-1.el9
Diff for 1426a20:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 4203b8e..d7070d4 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,19 +1,25 @@
Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon), Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
GitRepo: https://github.com/docker-library/mysql.git
-Tags: 8.0.37, 8.0, 8.0.37-oraclelinux9, 8.0-oraclelinux9, 8.0.37-oracle, 8.0-oracle
+Tags: 8.0.38, 8.0, 8.0.38-oraclelinux9, 8.0-oraclelinux9, 8.0.38-oracle, 8.0-oracle
Architectures: amd64, arm64v8
-GitCommit: 319db566ac7fef45c22f3df15ee5e194a7c43259
+GitCommit: db7daba00da79773c594b94bd91c9deeca1c9c88
Directory: 8.0
File: Dockerfile.oracle
-Tags: 8.0.37-bookworm, 8.0-bookworm, 8.0.37-debian, 8.0-debian
-GitCommit: 319db566ac7fef45c22f3df15ee5e194a7c43259
+Tags: 8.0.38-bookworm, 8.0-bookworm, 8.0.38-debian, 8.0-debian
+GitCommit: db7daba00da79773c594b94bd91c9deeca1c9c88
Directory: 8.0
File: Dockerfile.debian
-Tags: 8.4.0, 8.4, 8, lts, latest, innovation, 8.4.0-oraclelinux9, 8.4-oraclelinux9, 8-oraclelinux9, lts-oraclelinux9, oraclelinux9, innovation-oraclelinux9, 8.4.0-oracle, 8.4-oracle, 8-oracle, lts-oracle, oracle, innovation-oracle
+Tags: 8.4.1, 8.4, 8, lts, 8.4.1-oraclelinux9, 8.4-oraclelinux9, 8-oraclelinux9, lts-oraclelinux9, 8.4.1-oracle, 8.4-oracle, 8-oracle, lts-oracle
Architectures: amd64, arm64v8
-GitCommit: 319db566ac7fef45c22f3df15ee5e194a7c43259
+GitCommit: efa7479ffbb00139f6f1f0b0fe70985f20ee0456
Directory: 8.4
File: Dockerfile.oracle
+
+Tags: 9.0.0, 9.0, 9, innovation, latest, 9.0.0-oraclelinux9, 9.0-oraclelinux9, 9-oraclelinux9, innovation-oraclelinux9, oraclelinux9, 9.0.0-oracle, 9.0-oracle, 9-oracle, innovation-oracle, oracle
+Architectures: amd64, arm64v8
+GitCommit: 3d11822710789e82f64f08c578162a5b804d2f2f
+Directory: innovation
+File: Dockerfile.oracle
diff --git a/_bashbrew-list b/_bashbrew-list
index ebc05dc..34e32f8 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -6,17 +6,26 @@ mysql:8.0-bookworm
mysql:8.0-debian
mysql:8.0-oracle
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-oraclelinux9
+mysql:8.0.38
+mysql:8.0.38-bookworm
+mysql:8.0.38-debian
+mysql:8.0.38-oracle
+mysql:8.0.38-oraclelinux9
mysql:8.4
mysql:8.4-oracle
mysql:8.4-oraclelinux9
-mysql:8.4.0
-mysql:8.4.0-oracle
-mysql:8.4.0-oraclelinux9
+mysql:8.4.1
+mysql:8.4.1-oracle
+mysql:8.4.1-oraclelinux9
+mysql:9
+mysql:9-oracle
+mysql:9-oraclelinux9
+mysql:9.0
+mysql:9.0-oracle
+mysql:9.0-oraclelinux9
+mysql:9.0.0
+mysql:9.0.0-oracle
+mysql:9.0.0-oraclelinux9
mysql:innovation
mysql:innovation-oracle
mysql:innovation-oraclelinux9
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index ab0126a..0c88cf7 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,3 +1,4 @@
mysql:8.0-debian
mysql:8.0-oracle
-mysql:innovation-oracle
+mysql:lts-oracle
+mysql:oracle
diff --git a/mysql_8.0-debian/Dockerfile.debian b/mysql_8.0-debian/Dockerfile.debian
index db6808d..5e08f3f 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.37-1debian12
+ENV MYSQL_VERSION 8.0.38-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 d872b66..d18d98f 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.37-1.el9
+ENV MYSQL_VERSION 8.0.38-1.el9
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.37-1.el9
+ENV MYSQL_SHELL_VERSION 8.0.38-1.el9
RUN set -eux; \
microdnf install -y "mysql-shell-$MYSQL_SHELL_VERSION"; \
microdnf clean all; \
diff --git a/mysql_innovation-oracle/Dockerfile.oracle b/mysql_lts-oracle/Dockerfile.oracle
similarity index 98%
copy from mysql_innovation-oracle/Dockerfile.oracle
copy to mysql_lts-oracle/Dockerfile.oracle
index 607f9c5..4268b26 100644
--- a/mysql_innovation-oracle/Dockerfile.oracle
+++ b/mysql_lts-oracle/Dockerfile.oracle
@@ -56,7 +56,7 @@ RUN set -eux; \
rm -rf "$GNUPGHOME"
ENV MYSQL_MAJOR 8.4
-ENV MYSQL_VERSION 8.4.0-1.el9
+ENV MYSQL_VERSION 8.4.1-1.el9
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.4.0-1.el9
+ENV MYSQL_SHELL_VERSION 8.4.1-1.el9
RUN set -eux; \
microdnf install -y "mysql-shell-$MYSQL_SHELL_VERSION"; \
microdnf clean all; \
diff --git a/mysql_innovation-oracle/docker-entrypoint.sh b/mysql_lts-oracle/docker-entrypoint.sh
similarity index 100%
rename from mysql_innovation-oracle/docker-entrypoint.sh
rename to mysql_lts-oracle/docker-entrypoint.sh
diff --git a/mysql_innovation-oracle/Dockerfile.oracle b/mysql_oracle/Dockerfile.oracle
similarity index 91%
rename from mysql_innovation-oracle/Dockerfile.oracle
rename to mysql_oracle/Dockerfile.oracle
index 607f9c5..7752a90 100644
--- a/mysql_innovation-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 8.4
-ENV MYSQL_VERSION 8.4.0-1.el9
+ENV MYSQL_MAJOR innovation
+ENV MYSQL_VERSION 9.0.0-1.el9
RUN set -eu; \
{ \
- echo '[mysql8.4-server-minimal]'; \
- echo 'name=MySQL 8.4 Server Minimal'; \
+ echo '[mysqlinnovation-server-minimal]'; \
+ echo 'name=MySQL innovation Server Minimal'; \
echo 'enabled=1'; \
- echo 'baseurl=https://repo.mysql.com/yum/mysql-8.4-community/docker/el/9/$basearch/'; \
+ echo 'baseurl=https://repo.mysql.com/yum/mysql-innovation-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/9/$basearch/'; \
+ echo 'baseurl=https://repo.mysql.com/yum/mysql-tools-innovation-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.el9
+ENV MYSQL_SHELL_VERSION 9.0.0-1.el9
RUN set -eux; \
microdnf install -y "mysql-shell-$MYSQL_SHELL_VERSION"; \
microdnf clean all; \
diff --git a/mysql_8.0-debian/docker-entrypoint.sh b/mysql_oracle/docker-entrypoint.sh
similarity index 100%
copy from mysql_8.0-debian/docker-entrypoint.sh
copy to mysql_oracle/docker-entrypoint.shRelevant Maintainers: |
tianon
approved these changes
Jul 2, 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: