Skip to content

Conversation

tianon
Copy link
Member

@tianon tianon commented Aug 24, 2022

Changes:

Changes:

- docker-library/mysql@dfb9d34: Merge pull request docker-library/mysql#912 from infosiftr/NULL
- docker-library/mysql@e03765d: Ignore "NULL" values in mkdir loop
@github-actions
Copy link

Diff for e393e1a:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index fbaf6ce..f68023a 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.39, 5.7, 5, 5.7.39-oracle, 5.7-oracle, 5-oracle
-GitCommit: 3ec244b5f50dae961690825b8a046fc722efda49
+GitCommit: e03765d83c1fddcfb48fa47dda6171c50b563382
 Directory: 5.7
 File: Dockerfile.oracle
 
 Tags: 5.7.39-debian, 5.7-debian, 5-debian
-GitCommit: 3ec244b5f50dae961690825b8a046fc722efda49
+GitCommit: e03765d83c1fddcfb48fa47dda6171c50b563382
 Directory: 5.7
 File: Dockerfile.debian
 
 Tags: 8.0.30, 8.0, 8, latest, 8.0.30-oracle, 8.0-oracle, 8-oracle, oracle
 Architectures: amd64, arm64v8
-GitCommit: 3ec244b5f50dae961690825b8a046fc722efda49
+GitCommit: e03765d83c1fddcfb48fa47dda6171c50b563382
 Directory: 8.0
 File: Dockerfile.oracle
 
 Tags: 8.0.30-debian, 8.0-debian, 8-debian, debian
-GitCommit: 3ec244b5f50dae961690825b8a046fc722efda49
+GitCommit: e03765d83c1fddcfb48fa47dda6171c50b563382
 Directory: 8.0
 File: Dockerfile.debian
diff --git a/mysql_5-debian/docker-entrypoint.sh b/mysql_5-debian/docker-entrypoint.sh
index 0a068c5..5819a38 100755
--- a/mysql_5-debian/docker-entrypoint.sh
+++ b/mysql_5-debian/docker-entrypoint.sh
@@ -208,7 +208,7 @@ docker_create_db_directories() {
 		dir="$(mysql_get_config "$conf" "$@")"
 
 		# skip empty values
-		if [ -z "$dir" ]; then
+		if [ -z "$dir" ] || [ "$dir" = 'NULL' ]; then
 			continue
 		fi
 		case "$conf" in
diff --git a/mysql_5-oracle/docker-entrypoint.sh b/mysql_5-oracle/docker-entrypoint.sh
index 0a068c5..5819a38 100755
--- a/mysql_5-oracle/docker-entrypoint.sh
+++ b/mysql_5-oracle/docker-entrypoint.sh
@@ -208,7 +208,7 @@ docker_create_db_directories() {
 		dir="$(mysql_get_config "$conf" "$@")"
 
 		# skip empty values
-		if [ -z "$dir" ]; then
+		if [ -z "$dir" ] || [ "$dir" = 'NULL' ]; then
 			continue
 		fi
 		case "$conf" in
diff --git a/mysql_debian/docker-entrypoint.sh b/mysql_debian/docker-entrypoint.sh
index 0a068c5..5819a38 100755
--- a/mysql_debian/docker-entrypoint.sh
+++ b/mysql_debian/docker-entrypoint.sh
@@ -208,7 +208,7 @@ docker_create_db_directories() {
 		dir="$(mysql_get_config "$conf" "$@")"
 
 		# skip empty values
-		if [ -z "$dir" ]; then
+		if [ -z "$dir" ] || [ "$dir" = 'NULL' ]; then
 			continue
 		fi
 		case "$conf" in
diff --git a/mysql_oracle/docker-entrypoint.sh b/mysql_oracle/docker-entrypoint.sh
index 0a068c5..5819a38 100755
--- a/mysql_oracle/docker-entrypoint.sh
+++ b/mysql_oracle/docker-entrypoint.sh
@@ -208,7 +208,7 @@ docker_create_db_directories() {
 		dir="$(mysql_get_config "$conf" "$@")"
 
 		# skip empty values
-		if [ -z "$dir" ]; then
+		if [ -z "$dir" ] || [ "$dir" = 'NULL' ]; then
 			continue
 		fi
 		case "$conf" in

Relevant Maintainers:

@yosifkit yosifkit merged commit 417768d into docker-library:master Aug 24, 2022
@yosifkit yosifkit deleted the mysql branch August 24, 2022 21:01
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