Bug #86523 Wrong root user altered for MYSQL_ONETIME_PASSWORD

If the variable is set, the entrypoint script will expire the root user,
but the code wasn't updated after the default root user was changed from
@% to @localhost (+ optional @MYSQL_ROOT_HOST), so the statement fails.

Author: ltangvald

5.6/docker-entrypoint.sh

@@ -107,9 +107,16 @@ if [ "$1" = 'mysqld' ]; then
 		done
 
 		if [ ! -z "$MYSQL_ONETIME_PASSWORD" ]; then
-			"${mysql[@]}" <<-EOSQL
-				ALTER USER 'root'@'%' PASSWORD EXPIRE;
-			EOSQL
+			if [ ! -z "$MYSQL_ROOT_HOST" ]; then
+				"${mysql[@]}" <<-EOSQL
+					ALTER USER 'root'@'${MYSQL_ROOT_HOST}' PASSWORD EXPIRE;
+					ALTER USER 'root'@'localhost' PASSWORD EXPIRE;
+				EOSQL
+			else
+				"${mysql[@]}" <<-EOSQL
+					ALTER USER 'root'@'localhost' PASSWORD EXPIRE;
+				EOSQL
+			fi
 		fi
 		if ! kill -s TERM "$pid" || ! wait "$pid"; then
 			echo >&2 'MySQL init process failed.'

5.7/docker-entrypoint.sh

@@ -105,9 +105,16 @@ if [ "$1" = 'mysqld' ]; then
 		done
 
 		if [ ! -z "$MYSQL_ONETIME_PASSWORD" ]; then
-			"${mysql[@]}" <<-EOSQL
-				ALTER USER 'root'@'%' PASSWORD EXPIRE;
-			EOSQL
+			if [ ! -z "$MYSQL_ROOT_HOST" ]; then
+				"${mysql[@]}" <<-EOSQL
+					ALTER USER 'root'@'${MYSQL_ROOT_HOST}' PASSWORD EXPIRE;
+					ALTER USER 'root'@'localhost' PASSWORD EXPIRE;
+				EOSQL
+			else
+				"${mysql[@]}" <<-EOSQL
+					ALTER USER 'root'@'localhost' PASSWORD EXPIRE;
+				EOSQL
+			fi
 		fi
 		if ! kill -s TERM "$pid" || ! wait "$pid"; then
 			echo >&2 'MySQL init process failed.'

8.0/docker-entrypoint.sh

@@ -105,9 +105,16 @@ if [ "$1" = 'mysqld' ]; then
 		done
 
 		if [ ! -z "$MYSQL_ONETIME_PASSWORD" ]; then
-			"${mysql[@]}" <<-EOSQL
-				ALTER USER 'root'@'%' PASSWORD EXPIRE;
-			EOSQL
+			if [ ! -z "$MYSQL_ROOT_HOST" ]; then
+				"${mysql[@]}" <<-EOSQL
+					ALTER USER 'root'@'${MYSQL_ROOT_HOST}' PASSWORD EXPIRE;
+					ALTER USER 'root'@'localhost' PASSWORD EXPIRE;
+				EOSQL
+			else
+				"${mysql[@]}" <<-EOSQL
+					ALTER USER 'root'@'localhost' PASSWORD EXPIRE;
+				EOSQL
+			fi
 		fi
 		if ! kill -s TERM "$pid" || ! wait "$pid"; then
 			echo >&2 'MySQL init process failed.'