fix by @srtlg prepend MYSQL DATABASE to .sql files

yobasystems · Mar 2, 2022 · 0f35a0e · 0f35a0e
1 parent 70ade5e
commit 0f35a0e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/alpine-mariadb-aarch64/files/run.sh b/alpine-mariadb-aarch64/files/run.sh
@@ -73,8 +73,8 @@ EOF
 
 	for f in /docker-entrypoint-initdb.d/*; do
 		case "$f" in
-			*.sql)    echo "$0: running $f"; /usr/bin/mysqld --user=mysql --bootstrap --verbose=0 --skip-name-resolve --skip-networking=0 < "$f"; echo ;;
-			*.sql.gz) echo "$0: running $f"; gunzip -c "$f" | /usr/bin/mysqld --user=mysql --bootstrap --verbose=0 --skip-name-resolve --skip-networking=0 < "$f"; echo ;;
+			*.sql)    echo "$0: running $f" { echo "use \`$MYSQL_DATABASE\`;" ; cat "$f" ; } /usr/bin/mysqld --user=root --bootstrap --verbose=0 --skip-name-resolve --skip-networking=0 echo ;;
+            *.sql.gz) echo "$0: running $f" { echo "use \`$MYSQL_DATABASE\`;" ; gunzip -c "$f" ; } /usr/bin/mysqld --user=root --bootstrap --verbose=0 --skip-name-resolve --skip-networking=0 echo ;;
 			*)        echo "$0: ignoring or entrypoint initdb empty $f" ;;
 		esac
 		echo

diff --git a/alpine-mariadb-amd64/files/run.sh b/alpine-mariadb-amd64/files/run.sh
@@ -73,8 +73,8 @@ EOF
 
 	for f in /docker-entrypoint-initdb.d/*; do
 		case "$f" in
-			*.sql)    echo "$0: running $f"; /usr/bin/mysqld --user=mysql --bootstrap --verbose=0 --skip-name-resolve --skip-networking=0 < "$f"; echo ;;
-			*.sql.gz) echo "$0: running $f"; gunzip -c "$f" | /usr/bin/mysqld --user=mysql --bootstrap --verbose=0 --skip-name-resolve --skip-networking=0 < "$f"; echo ;;
+			*.sql)    echo "$0: running $f" { echo "use \`$MYSQL_DATABASE\`;" ; cat "$f" ; } /usr/bin/mysqld --user=root --bootstrap --verbose=0 --skip-name-resolve --skip-networking=0 echo ;;
+            *.sql.gz) echo "$0: running $f" { echo "use \`$MYSQL_DATABASE\`;" ; gunzip -c "$f" ; } /usr/bin/mysqld --user=root --bootstrap --verbose=0 --skip-name-resolve --skip-networking=0 echo ;;
 			*)        echo "$0: ignoring or entrypoint initdb empty $f" ;;
 		esac
 		echo

diff --git a/alpine-mariadb-armhf/files/run.sh b/alpine-mariadb-armhf/files/run.sh
@@ -73,8 +73,8 @@ EOF
 
 	for f in /docker-entrypoint-initdb.d/*; do
 		case "$f" in
-			*.sql)    echo "$0: running $f"; /usr/bin/mysqld --user=mysql --bootstrap --verbose=0 --skip-name-resolve --skip-networking=0 < "$f"; echo ;;
-			*.sql.gz) echo "$0: running $f"; gunzip -c "$f" | /usr/bin/mysqld --user=mysql --bootstrap --verbose=0 --skip-name-resolve --skip-networking=0 < "$f"; echo ;;
+			*.sql)    echo "$0: running $f" { echo "use \`$MYSQL_DATABASE\`;" ; cat "$f" ; } /usr/bin/mysqld --user=root --bootstrap --verbose=0 --skip-name-resolve --skip-networking=0 echo ;;
+            *.sql.gz) echo "$0: running $f" { echo "use \`$MYSQL_DATABASE\`;" ; gunzip -c "$f" ; } /usr/bin/mysqld --user=root --bootstrap --verbose=0 --skip-name-resolve --skip-networking=0 echo ;;
 			*)        echo "$0: ignoring or entrypoint initdb empty $f" ;;
 		esac
 		echo