From 4efd12788923fae0a00fb6d19c7d07d329fa35d1 Mon Sep 17 00:00:00 2001 From: Lars Tangvald Date: Wed, 16 Oct 2019 16:43:39 +0200 Subject: [PATCH 1/2] Revert to not using daemonize flag for temporary startup of 5.7 server Daemonize lets us avoid a manual wait loop for the server to be ready, but for 5.7 it causes a log redirection error when the image is started with -t, so for now just revert 5.7 image to using the wait loop. --- .template.Debian/docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.template.Debian/docker-entrypoint.sh b/.template.Debian/docker-entrypoint.sh index dc6f50ab1..6f0f1316f 100755 --- a/.template.Debian/docker-entrypoint.sh +++ b/.template.Debian/docker-entrypoint.sh @@ -86,7 +86,7 @@ mysql_get_config() { # Do a temporary startup of the MySQL server, for init purposes docker_temp_server_start() { - if [ "${MYSQL_MAJOR}" = '5.6' ]; then + if [ "${MYSQL_MAJOR}" = '5.6' ] || [ "${MYSQL_MAJOR}" = '5.7' ]; then "$@" --skip-networking --socket="${SOCKET}" & mysql_note "Waiting for server startup" local i From 6659750146b7a6b91a96c786729b4d482cf49fe6 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 16 Oct 2019 07:59:19 -0700 Subject: [PATCH 2/2] Apply update.sh --- 5.6/docker-entrypoint.sh | 2 +- 5.7/docker-entrypoint.sh | 2 +- 8.0/docker-entrypoint.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/5.6/docker-entrypoint.sh b/5.6/docker-entrypoint.sh index dc6f50ab1..6f0f1316f 100755 --- a/5.6/docker-entrypoint.sh +++ b/5.6/docker-entrypoint.sh @@ -86,7 +86,7 @@ mysql_get_config() { # Do a temporary startup of the MySQL server, for init purposes docker_temp_server_start() { - if [ "${MYSQL_MAJOR}" = '5.6' ]; then + if [ "${MYSQL_MAJOR}" = '5.6' ] || [ "${MYSQL_MAJOR}" = '5.7' ]; then "$@" --skip-networking --socket="${SOCKET}" & mysql_note "Waiting for server startup" local i diff --git a/5.7/docker-entrypoint.sh b/5.7/docker-entrypoint.sh index dc6f50ab1..6f0f1316f 100755 --- a/5.7/docker-entrypoint.sh +++ b/5.7/docker-entrypoint.sh @@ -86,7 +86,7 @@ mysql_get_config() { # Do a temporary startup of the MySQL server, for init purposes docker_temp_server_start() { - if [ "${MYSQL_MAJOR}" = '5.6' ]; then + if [ "${MYSQL_MAJOR}" = '5.6' ] || [ "${MYSQL_MAJOR}" = '5.7' ]; then "$@" --skip-networking --socket="${SOCKET}" & mysql_note "Waiting for server startup" local i diff --git a/8.0/docker-entrypoint.sh b/8.0/docker-entrypoint.sh index dc6f50ab1..6f0f1316f 100755 --- a/8.0/docker-entrypoint.sh +++ b/8.0/docker-entrypoint.sh @@ -86,7 +86,7 @@ mysql_get_config() { # Do a temporary startup of the MySQL server, for init purposes docker_temp_server_start() { - if [ "${MYSQL_MAJOR}" = '5.6' ]; then + if [ "${MYSQL_MAJOR}" = '5.6' ] || [ "${MYSQL_MAJOR}" = '5.7' ]; then "$@" --skip-networking --socket="${SOCKET}" & mysql_note "Waiting for server startup" local i