From bc26ed3bb49aaa5f8483dbaf8d47f9e70ab71b5d Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 27 Feb 2020 13:58:03 -0800 Subject: [PATCH] Restore fix for silently skipped init scripts --- .template.Debian/docker-entrypoint.sh | 4 ++++ 5.6/docker-entrypoint.sh | 4 ++++ 5.7/docker-entrypoint.sh | 4 ++++ 8.0/docker-entrypoint.sh | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/.template.Debian/docker-entrypoint.sh b/.template.Debian/docker-entrypoint.sh index 5a805fd07..9b303adca 100755 --- a/.template.Debian/docker-entrypoint.sh +++ b/.template.Debian/docker-entrypoint.sh @@ -341,6 +341,10 @@ _main() { # there's no database, so it needs to be initialized if [ -z "$DATABASE_ALREADY_EXISTS" ]; then docker_verify_minimum_env + + # check dir permissions to reduce likelihood of half-initialized database + ls /docker-entrypoint-initdb.d/ > /dev/null + docker_init_database_dir "$@" mysql_note "Starting temporary server" diff --git a/5.6/docker-entrypoint.sh b/5.6/docker-entrypoint.sh index 5a805fd07..9b303adca 100755 --- a/5.6/docker-entrypoint.sh +++ b/5.6/docker-entrypoint.sh @@ -341,6 +341,10 @@ _main() { # there's no database, so it needs to be initialized if [ -z "$DATABASE_ALREADY_EXISTS" ]; then docker_verify_minimum_env + + # check dir permissions to reduce likelihood of half-initialized database + ls /docker-entrypoint-initdb.d/ > /dev/null + docker_init_database_dir "$@" mysql_note "Starting temporary server" diff --git a/5.7/docker-entrypoint.sh b/5.7/docker-entrypoint.sh index 5a805fd07..9b303adca 100755 --- a/5.7/docker-entrypoint.sh +++ b/5.7/docker-entrypoint.sh @@ -341,6 +341,10 @@ _main() { # there's no database, so it needs to be initialized if [ -z "$DATABASE_ALREADY_EXISTS" ]; then docker_verify_minimum_env + + # check dir permissions to reduce likelihood of half-initialized database + ls /docker-entrypoint-initdb.d/ > /dev/null + docker_init_database_dir "$@" mysql_note "Starting temporary server" diff --git a/8.0/docker-entrypoint.sh b/8.0/docker-entrypoint.sh index 5a805fd07..9b303adca 100755 --- a/8.0/docker-entrypoint.sh +++ b/8.0/docker-entrypoint.sh @@ -341,6 +341,10 @@ _main() { # there's no database, so it needs to be initialized if [ -z "$DATABASE_ALREADY_EXISTS" ]; then docker_verify_minimum_env + + # check dir permissions to reduce likelihood of half-initialized database + ls /docker-entrypoint-initdb.d/ > /dev/null + docker_init_database_dir "$@" mysql_note "Starting temporary server"