From ad6b97a27e6c09b81fb8d1e091b276b8ca5fff76 Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Mon, 18 Nov 2019 14:08:33 -0800 Subject: [PATCH] Fix note to use MARIADB_VERSION instead of MYSQL_VERSION --- 10.1/docker-entrypoint.sh | 2 +- 10.2/docker-entrypoint.sh | 2 +- 10.3/docker-entrypoint.sh | 2 +- 10.4/docker-entrypoint.sh | 2 +- docker-entrypoint.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/10.1/docker-entrypoint.sh b/10.1/docker-entrypoint.sh index 77c5d4c..60336f6 100755 --- a/10.1/docker-entrypoint.sh +++ b/10.1/docker-entrypoint.sh @@ -288,7 +288,7 @@ _main() { # skip setup if they aren't running mysqld or want an option that stops mysqld if [ "$1" = 'mysqld' ] && ! _mysql_want_help "$@"; then - mysql_note "Entrypoint script for MySQL Server ${MYSQL_VERSION} started." + mysql_note "Entrypoint script for MySQL Server ${MARIADB_VERSION} started." mysql_check_config "$@" # Load various environment variables diff --git a/10.2/docker-entrypoint.sh b/10.2/docker-entrypoint.sh index 77c5d4c..60336f6 100755 --- a/10.2/docker-entrypoint.sh +++ b/10.2/docker-entrypoint.sh @@ -288,7 +288,7 @@ _main() { # skip setup if they aren't running mysqld or want an option that stops mysqld if [ "$1" = 'mysqld' ] && ! _mysql_want_help "$@"; then - mysql_note "Entrypoint script for MySQL Server ${MYSQL_VERSION} started." + mysql_note "Entrypoint script for MySQL Server ${MARIADB_VERSION} started." mysql_check_config "$@" # Load various environment variables diff --git a/10.3/docker-entrypoint.sh b/10.3/docker-entrypoint.sh index 77c5d4c..60336f6 100755 --- a/10.3/docker-entrypoint.sh +++ b/10.3/docker-entrypoint.sh @@ -288,7 +288,7 @@ _main() { # skip setup if they aren't running mysqld or want an option that stops mysqld if [ "$1" = 'mysqld' ] && ! _mysql_want_help "$@"; then - mysql_note "Entrypoint script for MySQL Server ${MYSQL_VERSION} started." + mysql_note "Entrypoint script for MySQL Server ${MARIADB_VERSION} started." mysql_check_config "$@" # Load various environment variables diff --git a/10.4/docker-entrypoint.sh b/10.4/docker-entrypoint.sh index 77c5d4c..60336f6 100755 --- a/10.4/docker-entrypoint.sh +++ b/10.4/docker-entrypoint.sh @@ -288,7 +288,7 @@ _main() { # skip setup if they aren't running mysqld or want an option that stops mysqld if [ "$1" = 'mysqld' ] && ! _mysql_want_help "$@"; then - mysql_note "Entrypoint script for MySQL Server ${MYSQL_VERSION} started." + mysql_note "Entrypoint script for MySQL Server ${MARIADB_VERSION} started." mysql_check_config "$@" # Load various environment variables diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 77c5d4c..60336f6 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -288,7 +288,7 @@ _main() { # skip setup if they aren't running mysqld or want an option that stops mysqld if [ "$1" = 'mysqld' ] && ! _mysql_want_help "$@"; then - mysql_note "Entrypoint script for MySQL Server ${MYSQL_VERSION} started." + mysql_note "Entrypoint script for MySQL Server ${MARIADB_VERSION} started." mysql_check_config "$@" # Load various environment variables