Skip to content

Commit 2790344

Browse files
committed
Skip certificate generation if SSL is disabled
1 parent bc6e37a commit 2790344

File tree

4 files changed

+28
-4
lines changed

4 files changed

+28
-4
lines changed

.template.Debian/docker-entrypoint.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,13 @@ docker_init_database_dir() {
164164
fi
165165
mysql_note "Database files initialized"
166166

167-
if command -v mysql_ssl_rsa_setup > /dev/null && [ ! -e "$DATADIR/server-key.pem" ]; then
167+
local sslEnabled
168+
if \
169+
command -v mysql_ssl_rsa_setup > /dev/null \
170+
&& [ ! -e "$DATADIR/server-key.pem" ] \
171+
&& sslEnabled="$(mysql_get_config 'ssl' "$@")" \
172+
&& [ "$sslEnabled" = 'TRUE' ] \
173+
; then
168174
# https://github.com/mysql/mysql-server/blob/23032807537d8dd8ee4ec1c4d40f0633cd4e12f9/packaging/deb-in/extra/mysql-systemd-start#L81-L84
169175
mysql_note "Initializing certificates"
170176
mysql_ssl_rsa_setup --datadir="$DATADIR"

5.6/docker-entrypoint.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,13 @@ docker_init_database_dir() {
164164
fi
165165
mysql_note "Database files initialized"
166166

167-
if command -v mysql_ssl_rsa_setup > /dev/null && [ ! -e "$DATADIR/server-key.pem" ]; then
167+
local sslEnabled
168+
if \
169+
command -v mysql_ssl_rsa_setup > /dev/null \
170+
&& [ ! -e "$DATADIR/server-key.pem" ] \
171+
&& sslEnabled="$(mysql_get_config 'ssl' "$@")" \
172+
&& [ "$sslEnabled" = 'TRUE' ] \
173+
; then
168174
# https://github.com/mysql/mysql-server/blob/23032807537d8dd8ee4ec1c4d40f0633cd4e12f9/packaging/deb-in/extra/mysql-systemd-start#L81-L84
169175
mysql_note "Initializing certificates"
170176
mysql_ssl_rsa_setup --datadir="$DATADIR"

5.7/docker-entrypoint.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,13 @@ docker_init_database_dir() {
164164
fi
165165
mysql_note "Database files initialized"
166166

167-
if command -v mysql_ssl_rsa_setup > /dev/null && [ ! -e "$DATADIR/server-key.pem" ]; then
167+
local sslEnabled
168+
if \
169+
command -v mysql_ssl_rsa_setup > /dev/null \
170+
&& [ ! -e "$DATADIR/server-key.pem" ] \
171+
&& sslEnabled="$(mysql_get_config 'ssl' "$@")" \
172+
&& [ "$sslEnabled" = 'TRUE' ] \
173+
; then
168174
# https://github.com/mysql/mysql-server/blob/23032807537d8dd8ee4ec1c4d40f0633cd4e12f9/packaging/deb-in/extra/mysql-systemd-start#L81-L84
169175
mysql_note "Initializing certificates"
170176
mysql_ssl_rsa_setup --datadir="$DATADIR"

8.0/docker-entrypoint.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,13 @@ docker_init_database_dir() {
164164
fi
165165
mysql_note "Database files initialized"
166166

167-
if command -v mysql_ssl_rsa_setup > /dev/null && [ ! -e "$DATADIR/server-key.pem" ]; then
167+
local sslEnabled
168+
if \
169+
command -v mysql_ssl_rsa_setup > /dev/null \
170+
&& [ ! -e "$DATADIR/server-key.pem" ] \
171+
&& sslEnabled="$(mysql_get_config 'ssl' "$@")" \
172+
&& [ "$sslEnabled" = 'TRUE' ] \
173+
; then
168174
# https://github.com/mysql/mysql-server/blob/23032807537d8dd8ee4ec1c4d40f0633cd4e12f9/packaging/deb-in/extra/mysql-systemd-start#L81-L84
169175
mysql_note "Initializing certificates"
170176
mysql_ssl_rsa_setup --datadir="$DATADIR"

0 commit comments

Comments
 (0)