Skip to content

Update mysql #12702

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

Merged
merged 1 commit into from
Jun 27, 2022
Merged

Update mysql #12702

merged 1 commit into from
Jun 27, 2022

Conversation

tianon
Copy link
Member

@tianon tianon commented Jun 27, 2022

Changes:

Changes:

- docker-library/mysql@a8808d1: Merge pull request docker-library/mysql#871 from infosiftr/skip_missing_names_on_install
- docker-library/mysql@35b9008: Add --setopt=skip_missing_names_on_install=False to "yum install"
- docker-library/mysql@8720110: Merge pull request docker-library/mysql#870 from woutersamaey/master
- docker-library/mysql@b22945d: Added "bzip2" so we can import .sql.bz2 dumps.
@github-actions
Copy link

Diff for 594c2ea:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 1f8b8ed..9576afd 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,22 +2,22 @@ Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <yosi
 GitRepo: https://github.com/docker-library/mysql.git
 
 Tags: 5.7.38, 5.7, 5, 5.7.38-debian, 5.7-debian, 5-debian
-GitCommit: 275e9822858884a85434448cb6777683692365e6
+GitCommit: b22945da0ed9f152485cc68ff7565204e8d37db4
 Directory: 5.7
 File: Dockerfile.debian
 
 Tags: 5.7.38-oracle, 5.7-oracle, 5-oracle
-GitCommit: 275e9822858884a85434448cb6777683692365e6
+GitCommit: 35b90084fed1f790832d58447cb7cea1251710bd
 Directory: 5.7
 File: Dockerfile.oracle
 
 Tags: 8.0.29, 8.0, 8, latest, 8.0.29-debian, 8.0-debian, 8-debian, debian
-GitCommit: 275e9822858884a85434448cb6777683692365e6
+GitCommit: b22945da0ed9f152485cc68ff7565204e8d37db4
 Directory: 8.0
 File: Dockerfile.debian
 
 Tags: 8.0.29-oracle, 8.0-oracle, 8-oracle, oracle
 Architectures: amd64, arm64v8
-GitCommit: 275e9822858884a85434448cb6777683692365e6
+GitCommit: b22945da0ed9f152485cc68ff7565204e8d37db4
 Directory: 8.0
 File: Dockerfile.oracle
diff --git a/mysql_5-debian/Dockerfile.debian b/mysql_5-debian/Dockerfile.debian
index 2669b2e..f2c4352 100644
--- a/mysql_5-debian/Dockerfile.debian
+++ b/mysql_5-debian/Dockerfile.debian
@@ -39,6 +39,7 @@ RUN mkdir /docker-entrypoint-initdb.d
 RUN set -eux; \
 	apt-get update; \
 	apt-get install -y --no-install-recommends \
+		bzip2 \
 		openssl \
 # FATAL ERROR: please install the following Perl modules before executing /usr/local/mysql/scripts/mysql_install_db:
 # File::Basename
diff --git a/mysql_5-oracle/Dockerfile.oracle b/mysql_5-oracle/Dockerfile.oracle
index 9968530..f1fb6ac 100644
--- a/mysql_5-oracle/Dockerfile.oracle
+++ b/mysql_5-oracle/Dockerfile.oracle
@@ -39,7 +39,10 @@ RUN set -eux; \
 	gosu nobody true
 
 RUN set -eux; \
-	yum install -y \
+# https://github.com/docker-library/mysql/pull/871#issuecomment-1167954236
+	yum install -y --setopt=skip_missing_names_on_install=False oracle-epel-release-el7; \
+	yum install -y --setopt=skip_missing_names_on_install=False \
+		bzip2 \
 		gzip \
 		openssl \
 		xz \
@@ -73,7 +76,7 @@ RUN set -eu; \
 	} | tee /etc/yum.repos.d/mysql-community-minimal.repo
 
 RUN set -eux; \
-	yum install -y "mysql-community-server-minimal-$MYSQL_VERSION"; \
+	yum install -y --setopt=skip_missing_names_on_install=False "mysql-community-server-minimal-$MYSQL_VERSION"; \
 	yum clean all; \
 # the "socket" value in the Oracle packages is set to "/var/lib/mysql" which isn't a great place for the socket (we want it in "/var/run/mysqld" instead)
 # https://github.com/docker-library/mysql/pull/680#issuecomment-636121520
@@ -104,7 +107,7 @@ RUN set -eu; \
 	} | tee /etc/yum.repos.d/mysql-community-tools.repo
 ENV MYSQL_SHELL_VERSION 8.0.29-1.el7
 RUN set -eux; \
-	yum install -y "mysql-shell-$MYSQL_SHELL_VERSION"; \
+	yum install -y --setopt=skip_missing_names_on_install=False "mysql-shell-$MYSQL_SHELL_VERSION"; \
 	yum clean all; \
 	\
 	mysqlsh --version
diff --git a/mysql_debian/Dockerfile.debian b/mysql_debian/Dockerfile.debian
index e04e504..96c604e 100644
--- a/mysql_debian/Dockerfile.debian
+++ b/mysql_debian/Dockerfile.debian
@@ -39,6 +39,7 @@ RUN mkdir /docker-entrypoint-initdb.d
 RUN set -eux; \
 	apt-get update; \
 	apt-get install -y --no-install-recommends \
+		bzip2 \
 		openssl \
 # FATAL ERROR: please install the following Perl modules before executing /usr/local/mysql/scripts/mysql_install_db:
 # File::Basename
diff --git a/mysql_oracle/Dockerfile.oracle b/mysql_oracle/Dockerfile.oracle
index e2405e1..f5a2fd6 100644
--- a/mysql_oracle/Dockerfile.oracle
+++ b/mysql_oracle/Dockerfile.oracle
@@ -40,6 +40,7 @@ RUN set -eux; \
 
 RUN set -eux; \
 	microdnf install -y \
+		bzip2 \
 		gzip \
 		openssl \
 		xz \

Relevant Maintainers:

@yosifkit yosifkit merged commit 7351858 into docker-library:master Jun 27, 2022
@yosifkit yosifkit deleted the mysql branch June 27, 2022 23:22
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