Skip to content

Conversation

@tianon
Copy link
Member

@tianon tianon commented May 28, 2020

Changes:

Changes:

- MariaDB/mariadb-docker@e680bfc: Merge pull request MariaDB/mariadb-docker#311 from infosiftr/escape-database-wildcard
- MariaDB/mariadb-docker@1dc8ff1: Add wildcard escaping fix similar to MySQL
@github-actions
Copy link

Diff for 5a1c128:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 1e138b1..d2bf67d 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,25 +3,25 @@ GitRepo: https://github.com/docker-library/mariadb.git
 
 Tags: 10.1.45-bionic, 10.1-bionic, 10.1.45, 10.1
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: f2ba44905eb3aed53fca34536f05f109055d9bc2
+GitCommit: 1dc8ff16050abd03612148818e533fcb39332395
 Directory: 10.1
 
 Tags: 10.2.32-bionic, 10.2-bionic, 10.2.32, 10.2
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: f2ba44905eb3aed53fca34536f05f109055d9bc2
+GitCommit: 1dc8ff16050abd03612148818e533fcb39332395
 Directory: 10.2
 
 Tags: 10.3.23-bionic, 10.3-bionic, 10.3.23, 10.3
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: f2ba44905eb3aed53fca34536f05f109055d9bc2
+GitCommit: 1dc8ff16050abd03612148818e533fcb39332395
 Directory: 10.3
 
 Tags: 10.4.13-bionic, 10.4-bionic, 10-bionic, bionic, 10.4.13, 10.4, 10, latest
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: f2ba44905eb3aed53fca34536f05f109055d9bc2
+GitCommit: 1dc8ff16050abd03612148818e533fcb39332395
 Directory: 10.4
 
 Tags: 10.5.3-bionic, 10.5-bionic, rc-bionic, 10.5.3, 10.5, rc
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: f2ba44905eb3aed53fca34536f05f109055d9bc2
+GitCommit: 1dc8ff16050abd03612148818e533fcb39332395
 Directory: 10.5
diff --git a/mariadb_10.1/docker-entrypoint.sh b/mariadb_10.1/docker-entrypoint.sh
index 8e71c60..44a35e2 100755
--- a/mariadb_10.1/docker-entrypoint.sh
+++ b/mariadb_10.1/docker-entrypoint.sh
@@ -258,7 +258,7 @@ docker_setup_db() {
 
 		if [ -n "$MYSQL_DATABASE" ]; then
 			mysql_note "Giving user ${MYSQL_USER} access to schema ${MYSQL_DATABASE}"
-			docker_process_sql --database=mysql <<<"GRANT ALL ON \`$MYSQL_DATABASE\`.* TO '$MYSQL_USER'@'%' ;"
+			docker_process_sql --database=mysql <<<"GRANT ALL ON \`${MYSQL_DATABASE//_/\\_}\`.* TO '$MYSQL_USER'@'%' ;"
 		fi
 
 		docker_process_sql --database=mysql <<<"FLUSH PRIVILEGES ;"
diff --git a/mariadb_10.2/docker-entrypoint.sh b/mariadb_10.2/docker-entrypoint.sh
index 8e71c60..44a35e2 100755
--- a/mariadb_10.2/docker-entrypoint.sh
+++ b/mariadb_10.2/docker-entrypoint.sh
@@ -258,7 +258,7 @@ docker_setup_db() {
 
 		if [ -n "$MYSQL_DATABASE" ]; then
 			mysql_note "Giving user ${MYSQL_USER} access to schema ${MYSQL_DATABASE}"
-			docker_process_sql --database=mysql <<<"GRANT ALL ON \`$MYSQL_DATABASE\`.* TO '$MYSQL_USER'@'%' ;"
+			docker_process_sql --database=mysql <<<"GRANT ALL ON \`${MYSQL_DATABASE//_/\\_}\`.* TO '$MYSQL_USER'@'%' ;"
 		fi
 
 		docker_process_sql --database=mysql <<<"FLUSH PRIVILEGES ;"
diff --git a/mariadb_10.3/docker-entrypoint.sh b/mariadb_10.3/docker-entrypoint.sh
index 8e71c60..44a35e2 100755
--- a/mariadb_10.3/docker-entrypoint.sh
+++ b/mariadb_10.3/docker-entrypoint.sh
@@ -258,7 +258,7 @@ docker_setup_db() {
 
 		if [ -n "$MYSQL_DATABASE" ]; then
 			mysql_note "Giving user ${MYSQL_USER} access to schema ${MYSQL_DATABASE}"
-			docker_process_sql --database=mysql <<<"GRANT ALL ON \`$MYSQL_DATABASE\`.* TO '$MYSQL_USER'@'%' ;"
+			docker_process_sql --database=mysql <<<"GRANT ALL ON \`${MYSQL_DATABASE//_/\\_}\`.* TO '$MYSQL_USER'@'%' ;"
 		fi
 
 		docker_process_sql --database=mysql <<<"FLUSH PRIVILEGES ;"
diff --git a/mariadb_latest/docker-entrypoint.sh b/mariadb_latest/docker-entrypoint.sh
index 8e71c60..44a35e2 100755
--- a/mariadb_latest/docker-entrypoint.sh
+++ b/mariadb_latest/docker-entrypoint.sh
@@ -258,7 +258,7 @@ docker_setup_db() {
 
 		if [ -n "$MYSQL_DATABASE" ]; then
 			mysql_note "Giving user ${MYSQL_USER} access to schema ${MYSQL_DATABASE}"
-			docker_process_sql --database=mysql <<<"GRANT ALL ON \`$MYSQL_DATABASE\`.* TO '$MYSQL_USER'@'%' ;"
+			docker_process_sql --database=mysql <<<"GRANT ALL ON \`${MYSQL_DATABASE//_/\\_}\`.* TO '$MYSQL_USER'@'%' ;"
 		fi
 
 		docker_process_sql --database=mysql <<<"FLUSH PRIVILEGES ;"
diff --git a/mariadb_rc/docker-entrypoint.sh b/mariadb_rc/docker-entrypoint.sh
index 8e71c60..44a35e2 100755
--- a/mariadb_rc/docker-entrypoint.sh
+++ b/mariadb_rc/docker-entrypoint.sh
@@ -258,7 +258,7 @@ docker_setup_db() {
 
 		if [ -n "$MYSQL_DATABASE" ]; then
 			mysql_note "Giving user ${MYSQL_USER} access to schema ${MYSQL_DATABASE}"
-			docker_process_sql --database=mysql <<<"GRANT ALL ON \`$MYSQL_DATABASE\`.* TO '$MYSQL_USER'@'%' ;"
+			docker_process_sql --database=mysql <<<"GRANT ALL ON \`${MYSQL_DATABASE//_/\\_}\`.* TO '$MYSQL_USER'@'%' ;"
 		fi
 
 		docker_process_sql --database=mysql <<<"FLUSH PRIVILEGES ;"

@yosifkit yosifkit merged commit 71c23aa into docker-library:master May 28, 2020
@yosifkit yosifkit deleted the mariadb branch May 28, 2020 23:33
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