Skip to content
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 #9817

Merged
merged 1 commit into from
Mar 19, 2021
Merged

Update mysql #9817

merged 1 commit into from
Mar 19, 2021

Conversation

tianon
Copy link
Member

@tianon tianon commented Mar 19, 2021

Changes:

Changes:

- docker-library/mysql@7f405f6: Merge pull request docker-library/mysql#752 from infosiftr/more-text
- docker-library/mysql@dd8e5db: Improve error message clarity when MYSQL_USER="root"
@github-actions
Copy link

Diff for f9db00f:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index d8a85e8..0cdbf30 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,16 +2,16 @@ Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon), Joseph Ferguson <yosi
 GitRepo: https://github.com/docker-library/mysql.git
 
 Tags: 5.6.51, 5.6
-GitCommit: 6a9edebd6ed7b0178b0cce7495bea1777cb9f128
+GitCommit: dd8e5db3bc7c717542eb867b6addde7ccc9003e2
 Directory: 5.6
 File: Dockerfile.debian
 
 Tags: 5.7.33, 5.7, 5
-GitCommit: 6a9edebd6ed7b0178b0cce7495bea1777cb9f128
+GitCommit: dd8e5db3bc7c717542eb867b6addde7ccc9003e2
 Directory: 5.7
 File: Dockerfile.debian
 
 Tags: 8.0.23, 8.0, 8, latest
-GitCommit: 6a9edebd6ed7b0178b0cce7495bea1777cb9f128
+GitCommit: dd8e5db3bc7c717542eb867b6addde7ccc9003e2
 Directory: 8.0
 File: Dockerfile.debian
diff --git a/mysql_5.6/docker-entrypoint.sh b/mysql_5.6/docker-entrypoint.sh
index 461e34b..62e6a87 100755
--- a/mysql_5.6/docker-entrypoint.sh
+++ b/mysql_5.6/docker-entrypoint.sh
@@ -156,8 +156,8 @@ docker_verify_minimum_env() {
 	# This will prevent the CREATE USER from failing (and thus exiting with a half-initialized database)
 	if [ "$MYSQL_USER" = 'root' ]; then
 		mysql_error <<-'EOF'
-			MYSQL_USER="root", MYSQL_PASSWORD cannot be used for the root user
-			    Use one of the following to control the root user password:
+			MYSQL_USER="root", MYSQL_USER and MYSQL_PASSWORD are for configuring a regular user and cannot be used for the root user
+			    Remove MYSQL_USER="root" and use one of the following to control the root user password:
 			    - MYSQL_ROOT_PASSWORD
 			    - MYSQL_ALLOW_EMPTY_PASSWORD
 			    - MYSQL_RANDOM_ROOT_PASSWORD
diff --git a/mysql_5/docker-entrypoint.sh b/mysql_5/docker-entrypoint.sh
index 461e34b..62e6a87 100755
--- a/mysql_5/docker-entrypoint.sh
+++ b/mysql_5/docker-entrypoint.sh
@@ -156,8 +156,8 @@ docker_verify_minimum_env() {
 	# This will prevent the CREATE USER from failing (and thus exiting with a half-initialized database)
 	if [ "$MYSQL_USER" = 'root' ]; then
 		mysql_error <<-'EOF'
-			MYSQL_USER="root", MYSQL_PASSWORD cannot be used for the root user
-			    Use one of the following to control the root user password:
+			MYSQL_USER="root", MYSQL_USER and MYSQL_PASSWORD are for configuring a regular user and cannot be used for the root user
+			    Remove MYSQL_USER="root" and use one of the following to control the root user password:
 			    - MYSQL_ROOT_PASSWORD
 			    - MYSQL_ALLOW_EMPTY_PASSWORD
 			    - MYSQL_RANDOM_ROOT_PASSWORD
diff --git a/mysql_latest/docker-entrypoint.sh b/mysql_latest/docker-entrypoint.sh
index 461e34b..62e6a87 100755
--- a/mysql_latest/docker-entrypoint.sh
+++ b/mysql_latest/docker-entrypoint.sh
@@ -156,8 +156,8 @@ docker_verify_minimum_env() {
 	# This will prevent the CREATE USER from failing (and thus exiting with a half-initialized database)
 	if [ "$MYSQL_USER" = 'root' ]; then
 		mysql_error <<-'EOF'
-			MYSQL_USER="root", MYSQL_PASSWORD cannot be used for the root user
-			    Use one of the following to control the root user password:
+			MYSQL_USER="root", MYSQL_USER and MYSQL_PASSWORD are for configuring a regular user and cannot be used for the root user
+			    Remove MYSQL_USER="root" and use one of the following to control the root user password:
 			    - MYSQL_ROOT_PASSWORD
 			    - MYSQL_ALLOW_EMPTY_PASSWORD
 			    - MYSQL_RANDOM_ROOT_PASSWORD

@yosifkit yosifkit merged commit 63bdafe into docker-library:master Mar 19, 2021
@yosifkit yosifkit deleted the mysql branch March 19, 2021 16:59
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