From 2d86ed268c0dcacb38d9a39daf7686a9d9d61400 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 16 May 2018 11:24:29 -0700 Subject: [PATCH] Drop explicit "mysql_ssl_rsa_setup" invocation > I _think_ the separate mysql_ssl_rsa_setup utility was mostly just relevant before we started linking openssl (for licensing issues), so this may no longer be needed for any versions? Also, this behavior can be controlled with the auto_generate_certs and sha256_password_auto_generate_rsa_keys settings. So by virtue of me being over 2 years late *cough*, I think this probably isn't needed any more :) --- 5.7/docker-entrypoint.sh | 7 ------- 8.0/docker-entrypoint.sh | 7 ------- template/docker-entrypoint.sh | 7 ------- 3 files changed, 21 deletions(-) diff --git a/5.7/docker-entrypoint.sh b/5.7/docker-entrypoint.sh index 761da5349..f4e6c865b 100755 --- a/5.7/docker-entrypoint.sh +++ b/5.7/docker-entrypoint.sh @@ -192,13 +192,6 @@ docker_init_database_dir() { mysql_note "Initializing database files" "$@" --initialize-insecure --default-time-zone=SYSTEM mysql_note "Database files initialized" - - if command -v mysql_ssl_rsa_setup > /dev/null && [ ! -e "$DATADIR/server-key.pem" ]; then - # https://github.com/mysql/mysql-server/blob/23032807537d8dd8ee4ec1c4d40f0633cd4e12f9/packaging/deb-in/extra/mysql-systemd-start#L81-L84 - mysql_note "Initializing certificates" - mysql_ssl_rsa_setup --datadir="$DATADIR" - mysql_note "Certificates initialized" - fi } # Loads various settings that are used elsewhere in the script diff --git a/8.0/docker-entrypoint.sh b/8.0/docker-entrypoint.sh index 761da5349..f4e6c865b 100755 --- a/8.0/docker-entrypoint.sh +++ b/8.0/docker-entrypoint.sh @@ -192,13 +192,6 @@ docker_init_database_dir() { mysql_note "Initializing database files" "$@" --initialize-insecure --default-time-zone=SYSTEM mysql_note "Database files initialized" - - if command -v mysql_ssl_rsa_setup > /dev/null && [ ! -e "$DATADIR/server-key.pem" ]; then - # https://github.com/mysql/mysql-server/blob/23032807537d8dd8ee4ec1c4d40f0633cd4e12f9/packaging/deb-in/extra/mysql-systemd-start#L81-L84 - mysql_note "Initializing certificates" - mysql_ssl_rsa_setup --datadir="$DATADIR" - mysql_note "Certificates initialized" - fi } # Loads various settings that are used elsewhere in the script diff --git a/template/docker-entrypoint.sh b/template/docker-entrypoint.sh index 761da5349..f4e6c865b 100755 --- a/template/docker-entrypoint.sh +++ b/template/docker-entrypoint.sh @@ -192,13 +192,6 @@ docker_init_database_dir() { mysql_note "Initializing database files" "$@" --initialize-insecure --default-time-zone=SYSTEM mysql_note "Database files initialized" - - if command -v mysql_ssl_rsa_setup > /dev/null && [ ! -e "$DATADIR/server-key.pem" ]; then - # https://github.com/mysql/mysql-server/blob/23032807537d8dd8ee4ec1c4d40f0633cd4e12f9/packaging/deb-in/extra/mysql-systemd-start#L81-L84 - mysql_note "Initializing certificates" - mysql_ssl_rsa_setup --datadir="$DATADIR" - mysql_note "Certificates initialized" - fi } # Loads various settings that are used elsewhere in the script