Skip to content

Conversation

tianon
Copy link
Member

@tianon tianon commented Oct 19, 2022

Changes:

Changes:

- docker-library/mysql@e6728d7: Merge pull request docker-library/mysql#913 from chilin0525/master
- docker-library/mysql@e0d43b2: Add more clear description when password option not specified
- docker-library/mysql@d840588: Merge pull request docker-library/mysql#919 from infosiftr/ci-updates
- docker-library/mysql@858a447: Switch to "$GITHUB_OUTPUT"; update actions/checkout to v3
@github-actions
Copy link

Diff for 2e558df:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 6b704e6..ca6a97f 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,22 +2,22 @@ Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon), Joseph Ferguson <yosi
 GitRepo: https://github.com/docker-library/mysql.git
 
 Tags: 5.7.40, 5.7, 5, 5.7.40-oracle, 5.7-oracle, 5-oracle
-GitCommit: 167bab0210fbe9bb83bb7bc1b5553dc85146b089
+GitCommit: e0d43b2a29867c5b7d5c01a8fea30a086861df2b
 Directory: 5.7
 File: Dockerfile.oracle
 
 Tags: 5.7.40-debian, 5.7-debian, 5-debian
-GitCommit: 167bab0210fbe9bb83bb7bc1b5553dc85146b089
+GitCommit: e0d43b2a29867c5b7d5c01a8fea30a086861df2b
 Directory: 5.7
 File: Dockerfile.debian
 
 Tags: 8.0.31, 8.0, 8, latest, 8.0.31-oracle, 8.0-oracle, 8-oracle, oracle
 Architectures: amd64, arm64v8
-GitCommit: 80c475648969a83e52802e8eb2ad90519f882421
+GitCommit: e0d43b2a29867c5b7d5c01a8fea30a086861df2b
 Directory: 8.0
 File: Dockerfile.oracle
 
 Tags: 8.0.31-debian, 8.0-debian, 8-debian, debian
-GitCommit: 80c475648969a83e52802e8eb2ad90519f882421
+GitCommit: e0d43b2a29867c5b7d5c01a8fea30a086861df2b
 Directory: 8.0
 File: Dockerfile.debian
diff --git a/mysql_5-debian/docker-entrypoint.sh b/mysql_5-debian/docker-entrypoint.sh
index 5819a38..6ce3bae 100755
--- a/mysql_5-debian/docker-entrypoint.sh
+++ b/mysql_5-debian/docker-entrypoint.sh
@@ -160,7 +160,7 @@ docker_verify_minimum_env() {
 	if [ -z "$MYSQL_ROOT_PASSWORD" -a -z "$MYSQL_ALLOW_EMPTY_PASSWORD" -a -z "$MYSQL_RANDOM_ROOT_PASSWORD" ]; then
 		mysql_error <<-'EOF'
 			Database is uninitialized and password option is not specified
-			    You need to specify one of the following:
+			    You need to specify one of the following as an environment variable:
 			    - MYSQL_ROOT_PASSWORD
 			    - MYSQL_ALLOW_EMPTY_PASSWORD
 			    - MYSQL_RANDOM_ROOT_PASSWORD
diff --git a/mysql_5-oracle/docker-entrypoint.sh b/mysql_5-oracle/docker-entrypoint.sh
index 5819a38..6ce3bae 100755
--- a/mysql_5-oracle/docker-entrypoint.sh
+++ b/mysql_5-oracle/docker-entrypoint.sh
@@ -160,7 +160,7 @@ docker_verify_minimum_env() {
 	if [ -z "$MYSQL_ROOT_PASSWORD" -a -z "$MYSQL_ALLOW_EMPTY_PASSWORD" -a -z "$MYSQL_RANDOM_ROOT_PASSWORD" ]; then
 		mysql_error <<-'EOF'
 			Database is uninitialized and password option is not specified
-			    You need to specify one of the following:
+			    You need to specify one of the following as an environment variable:
 			    - MYSQL_ROOT_PASSWORD
 			    - MYSQL_ALLOW_EMPTY_PASSWORD
 			    - MYSQL_RANDOM_ROOT_PASSWORD
diff --git a/mysql_debian/docker-entrypoint.sh b/mysql_debian/docker-entrypoint.sh
index 5819a38..6ce3bae 100755
--- a/mysql_debian/docker-entrypoint.sh
+++ b/mysql_debian/docker-entrypoint.sh
@@ -160,7 +160,7 @@ docker_verify_minimum_env() {
 	if [ -z "$MYSQL_ROOT_PASSWORD" -a -z "$MYSQL_ALLOW_EMPTY_PASSWORD" -a -z "$MYSQL_RANDOM_ROOT_PASSWORD" ]; then
 		mysql_error <<-'EOF'
 			Database is uninitialized and password option is not specified
-			    You need to specify one of the following:
+			    You need to specify one of the following as an environment variable:
 			    - MYSQL_ROOT_PASSWORD
 			    - MYSQL_ALLOW_EMPTY_PASSWORD
 			    - MYSQL_RANDOM_ROOT_PASSWORD
diff --git a/mysql_oracle/docker-entrypoint.sh b/mysql_oracle/docker-entrypoint.sh
index 5819a38..6ce3bae 100755
--- a/mysql_oracle/docker-entrypoint.sh
+++ b/mysql_oracle/docker-entrypoint.sh
@@ -160,7 +160,7 @@ docker_verify_minimum_env() {
 	if [ -z "$MYSQL_ROOT_PASSWORD" -a -z "$MYSQL_ALLOW_EMPTY_PASSWORD" -a -z "$MYSQL_RANDOM_ROOT_PASSWORD" ]; then
 		mysql_error <<-'EOF'
 			Database is uninitialized and password option is not specified
-			    You need to specify one of the following:
+			    You need to specify one of the following as an environment variable:
 			    - MYSQL_ROOT_PASSWORD
 			    - MYSQL_ALLOW_EMPTY_PASSWORD
 			    - MYSQL_RANDOM_ROOT_PASSWORD

Relevant Maintainers:

@yosifkit yosifkit merged commit 6eca270 into docker-library:master Oct 19, 2022
@yosifkit yosifkit deleted the mysql branch October 19, 2022 18: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