Skip to content

Commit 23c46e2

Browse files
committed
Fixed support for empty password
- Script was applying -p even if MYSQL_ROOT_PASSWORD wasn't set, causing init to fail
1 parent 1b0df69 commit 23c46e2

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

5.5/docker-entrypoint.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@ if [ "$1" = 'mysqld' ]; then
5252
DROP DATABASE IF EXISTS test ;
5353
FLUSH PRIVILEGES ;
5454
EOSQL
55-
mysql+=( -p"${MYSQL_ROOT_PASSWORD}" )
55+
if [ ! -z "$MYSQL_ROOT_PASSWORD" ]; then
56+
mysql+=( -p"${MYSQL_ROOT_PASSWORD}" )
57+
fi
5658

5759
if [ "$MYSQL_DATABASE" ]; then
5860
echo "CREATE DATABASE IF NOT EXISTS \`$MYSQL_DATABASE\` ;" | "${mysql[@]}"

5.6/docker-entrypoint.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ if [ "$1" = 'mysqld' ]; then
5353
DROP DATABASE IF EXISTS test ;
5454
FLUSH PRIVILEGES ;
5555
EOSQL
56-
mysql+=( -p"${MYSQL_ROOT_PASSWORD}" )
56+
if [ ! -z "$MYSQL_ROOT_PASSWORD" ]; then
57+
mysql+=( -p"${MYSQL_ROOT_PASSWORD}" )
58+
fi
5759

5860
if [ "$MYSQL_DATABASE" ]; then
5961
echo "CREATE DATABASE IF NOT EXISTS \`$MYSQL_DATABASE\` ;" | "${mysql[@]}"

5.7/docker-entrypoint.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@ if [ "$1" = 'mysqld' ]; then
5252
DROP DATABASE IF EXISTS test ;
5353
FLUSH PRIVILEGES ;
5454
EOSQL
55-
mysql+=( -p"${MYSQL_ROOT_PASSWORD}" )
55+
if [ ! -z "$MYSQL_ROOT_PASSWORD" ]; then
56+
mysql+=( -p"${MYSQL_ROOT_PASSWORD}" )
57+
fi
5658

5759
if [ "$MYSQL_DATABASE" ]; then
5860
echo "CREATE DATABASE IF NOT EXISTS \`$MYSQL_DATABASE\` ;" | "${mysql[@]}"

0 commit comments

Comments
 (0)