-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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 #15908
Merged
Merged
Update mysql #15908
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
Changes: - docker-library/mysql@64f9436: Merge pull request docker-library/mysql#1015 from infosiftr/repo-urls - docker-library/mysql@0097ab8: Update tools repo handling and update innovation to mysql-shell 8.2.1 - docker-library/mysql@dc35bed: Fix skip-host-cache deprecation warning (docker-library/mysql#1002)
Diff for eee1a94:diff --git a/_bashbrew-cat b/_bashbrew-cat
index ccf0aed..bb712f6 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,23 +2,23 @@ Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <yosi
GitRepo: https://github.com/docker-library/mysql.git
Tags: 5.7.44, 5.7, 5, 5.7.44-oracle, 5.7-oracle, 5-oracle
-GitCommit: 9678ed1d27794ae9529c43b4411e30f981ce39ea
+GitCommit: 0097ab8a1fde788a9a51357339fa5498855623e2
Directory: 5.7
File: Dockerfile.oracle
Tags: 8.0.35, 8.0, 8.0.35-oracle, 8.0-oracle
Architectures: amd64, arm64v8
-GitCommit: 84ba05eaa75e1f0e1d33185e23f95a9cdc607b51
+GitCommit: 0097ab8a1fde788a9a51357339fa5498855623e2
Directory: 8.0
File: Dockerfile.oracle
Tags: 8.0.35-debian, 8.0-debian
-GitCommit: 84ba05eaa75e1f0e1d33185e23f95a9cdc607b51
+GitCommit: dc35beded3a41c4c62dfaa7f86ea5721c02a2e8b
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
Architectures: amd64, arm64v8
-GitCommit: 76806cdd0acee2dec39b1b66e9c8015ef75be196
+GitCommit: 0097ab8a1fde788a9a51357339fa5498855623e2
Directory: innovation
File: Dockerfile.oracle
diff --git a/mysql_5-oracle/Dockerfile.oracle b/mysql_5-oracle/Dockerfile.oracle
index 34dd848..9f1f8bb 100644
--- a/mysql_5-oracle/Dockerfile.oracle
+++ b/mysql_5-oracle/Dockerfile.oracle
@@ -56,12 +56,11 @@ ENV MYSQL_MAJOR 5.7
ENV MYSQL_VERSION 5.7.44-1.el7
RUN set -eu; \
- . /etc/os-release; \
{ \
echo '[mysql5.7-server-minimal]'; \
echo 'name=MySQL 5.7 Server Minimal'; \
echo 'enabled=1'; \
- echo "baseurl=https://repo.mysql.com/yum/mysql-5.7-community/docker/el/${VERSION_ID%%[.-]*}/\$basearch/"; \
+ echo 'baseurl=https://repo.mysql.com/yum/mysql-5.7-community/docker/el/7/$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
@@ -104,11 +103,10 @@ RUN set -eux; \
mysql --version
RUN set -eu; \
- . /etc/os-release; \
{ \
echo '[mysql-tools-community]'; \
echo 'name=MySQL Tools Community'; \
- echo "baseurl=https://repo.mysql.com/yum/mysql-tools-community/el/${VERSION_ID%%[.-]*}/\$basearch/"; \
+ echo 'baseurl=https://repo.mysql.com/yum/mysql-tools-community/el/7/$basearch/'; \
echo 'enabled=1'; \
echo 'gpgcheck=1'; \
echo 'gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql'; \
diff --git a/mysql_8.0-debian/config/conf.d/docker.cnf b/mysql_8.0-debian/config/conf.d/docker.cnf
index 4f1829d..205bedb 100644
--- a/mysql_8.0-debian/config/conf.d/docker.cnf
+++ b/mysql_8.0-debian/config/conf.d/docker.cnf
@@ -1,3 +1,3 @@
[mysqld]
-skip-host-cache
+host_cache_size=0
skip-name-resolve
diff --git a/mysql_8.0-oracle/Dockerfile.oracle b/mysql_8.0-oracle/Dockerfile.oracle
index dedf8ed..0bc9653 100644
--- a/mysql_8.0-oracle/Dockerfile.oracle
+++ b/mysql_8.0-oracle/Dockerfile.oracle
@@ -56,12 +56,11 @@ ENV MYSQL_MAJOR 8.0
ENV MYSQL_VERSION 8.0.35-1.el8
RUN set -eu; \
- . /etc/os-release; \
{ \
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/${VERSION_ID%%[.-]*}/\$basearch/"; \
+ echo 'baseurl=https://repo.mysql.com/yum/mysql-8.0-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
@@ -95,11 +94,10 @@ RUN set -eux; \
mysql --version
RUN set -eu; \
- . /etc/os-release; \
{ \
echo '[mysql-tools-community]'; \
echo 'name=MySQL Tools Community'; \
- echo "baseurl=https://repo.mysql.com/yum/mysql-tools-community/el/${VERSION_ID%%[.-]*}/\$basearch/"; \
+ echo 'baseurl=https://repo.mysql.com/yum/mysql-tools-community/el/8/$basearch/'; \
echo 'enabled=1'; \
echo 'gpgcheck=1'; \
echo 'gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql'; \
diff --git a/mysql_oracle/Dockerfile.oracle b/mysql_oracle/Dockerfile.oracle
index 2ae20b8..334a3d0 100644
--- a/mysql_oracle/Dockerfile.oracle
+++ b/mysql_oracle/Dockerfile.oracle
@@ -56,12 +56,11 @@ ENV MYSQL_MAJOR innovation
ENV MYSQL_VERSION 8.2.0-1.el8
RUN set -eu; \
- . /etc/os-release; \
{ \
echo '[mysqlinnovation-server-minimal]'; \
echo 'name=MySQL innovation Server Minimal'; \
echo 'enabled=1'; \
- echo "baseurl=https://repo.mysql.com/yum/mysql-innovation-community/docker/el/${VERSION_ID%%[.-]*}/\$basearch/"; \
+ echo 'baseurl=https://repo.mysql.com/yum/mysql-innovation-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
@@ -95,18 +94,17 @@ RUN set -eux; \
mysql --version
RUN set -eu; \
- . /etc/os-release; \
{ \
echo '[mysql-tools-community]'; \
echo 'name=MySQL Tools Community'; \
- echo "baseurl=https://repo.mysql.com/yum/mysql-tools-community/el/${VERSION_ID%%[.-]*}/\$basearch/"; \
+ echo 'baseurl=https://repo.mysql.com/yum/mysql-tools-innovation-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.0.35-1.el8
+ENV MYSQL_SHELL_VERSION 8.2.1-1.el8
RUN set -eux; \
microdnf install -y "mysql-shell-$MYSQL_SHELL_VERSION"; \
microdnf clean all; \ Relevant Maintainers: |
yosifkit
approved these changes
Dec 14, 2023
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: