Skip ssl on docker_temp_server_start

Closes: #592
MariaDB · Jun 10, 2024 · d80c455 · d80c455
1 parent 43ea329
commit d80c455
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 13 deletions.
diff --git a/10.11-ubi/docker-entrypoint.sh b/10.11-ubi/docker-entrypoint.sh
@@ -121,7 +121,7 @@ mysql_get_config() {
 docker_temp_server_start() {
  "$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
  --expire-logs-days=0 \
- --loose-innodb_buffer_pool_load_at_startup=0 &
+ --loose-innodb_buffer_pool_load_at_startup=0 --skip-ssl &
  declare -g MARIADB_PID
  MARIADB_PID=$!
  mysql_note "Waiting for server startup"

diff --git a/10.11/docker-entrypoint.sh b/10.11/docker-entrypoint.sh
@@ -121,7 +121,7 @@ mysql_get_config() {
 docker_temp_server_start() {
  "$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
  --expire-logs-days=0 \
- --loose-innodb_buffer_pool_load_at_startup=0 &
+ --loose-innodb_buffer_pool_load_at_startup=0 --skip-ssl &
  declare -g MARIADB_PID
  MARIADB_PID=$!
  mysql_note "Waiting for server startup"

diff --git a/10.4/docker-entrypoint.sh b/10.4/docker-entrypoint.sh
@@ -121,7 +121,7 @@ mysql_get_config() {
 docker_temp_server_start() {
  "$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
  --expire-logs-days=0 \
- --loose-innodb_buffer_pool_load_at_startup=0 &
+ --loose-innodb_buffer_pool_load_at_startup=0 --skip-ssl &
  declare -g MARIADB_PID
  MARIADB_PID=$!
  mysql_note "Waiting for server startup"

diff --git a/10.5/docker-entrypoint.sh b/10.5/docker-entrypoint.sh
@@ -121,7 +121,7 @@ mysql_get_config() {
 docker_temp_server_start() {
  "$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
  --expire-logs-days=0 \
- --loose-innodb_buffer_pool_load_at_startup=0 &
+ --loose-innodb_buffer_pool_load_at_startup=0 --skip-ssl &
  declare -g MARIADB_PID
  MARIADB_PID=$!
  mysql_note "Waiting for server startup"

diff --git a/10.6-ubi/docker-entrypoint.sh b/10.6-ubi/docker-entrypoint.sh
@@ -121,7 +121,7 @@ mysql_get_config() {
 docker_temp_server_start() {
  "$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
  --expire-logs-days=0 \
- --loose-innodb_buffer_pool_load_at_startup=0 &
+ --loose-innodb_buffer_pool_load_at_startup=0 --skip-ssl &
  declare -g MARIADB_PID
  MARIADB_PID=$!
  mysql_note "Waiting for server startup"

diff --git a/10.6/docker-entrypoint.sh b/10.6/docker-entrypoint.sh
@@ -121,7 +121,7 @@ mysql_get_config() {
 docker_temp_server_start() {
  "$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
  --expire-logs-days=0 \
- --loose-innodb_buffer_pool_load_at_startup=0 &
+ --loose-innodb_buffer_pool_load_at_startup=0 --skip-ssl &
  declare -g MARIADB_PID
  MARIADB_PID=$!
  mysql_note "Waiting for server startup"

diff --git a/11.1/docker-entrypoint.sh b/11.1/docker-entrypoint.sh
@@ -121,7 +121,7 @@ mysql_get_config() {
 docker_temp_server_start() {
  "$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
  --expire-logs-days=0 \
- --loose-innodb_buffer_pool_load_at_startup=0 &
+ --loose-innodb_buffer_pool_load_at_startup=0 --skip-ssl &
  declare -g MARIADB_PID
  MARIADB_PID=$!
  mysql_note "Waiting for server startup"

diff --git a/11.2/docker-entrypoint.sh b/11.2/docker-entrypoint.sh
@@ -121,7 +121,7 @@ mysql_get_config() {
 docker_temp_server_start() {
  "$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
  --expire-logs-days=0 \
- --loose-innodb_buffer_pool_load_at_startup=0 &
+ --loose-innodb_buffer_pool_load_at_startup=0 --skip-ssl &
  declare -g MARIADB_PID
  MARIADB_PID=$!
  mysql_note "Waiting for server startup"

diff --git a/11.4-ubi/docker-entrypoint.sh b/11.4-ubi/docker-entrypoint.sh
@@ -121,7 +121,7 @@ mysql_get_config() {
 docker_temp_server_start() {
  "$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
  --expire-logs-days=0 \
- --loose-innodb_buffer_pool_load_at_startup=0 &
+ --loose-innodb_buffer_pool_load_at_startup=0 --skip-ssl &
  declare -g MARIADB_PID
  MARIADB_PID=$!
  mysql_note "Waiting for server startup"

diff --git a/11.4/docker-entrypoint.sh b/11.4/docker-entrypoint.sh
@@ -121,7 +121,7 @@ mysql_get_config() {
 docker_temp_server_start() {
  "$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
  --expire-logs-days=0 \
- --loose-innodb_buffer_pool_load_at_startup=0 &
+ --loose-innodb_buffer_pool_load_at_startup=0 --skip-ssl &
  declare -g MARIADB_PID
  MARIADB_PID=$!
  mysql_note "Waiting for server startup"

diff --git a/11.5-ubi/docker-entrypoint.sh b/11.5-ubi/docker-entrypoint.sh
@@ -121,7 +121,7 @@ mysql_get_config() {
 docker_temp_server_start() {
  "$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
  --expire-logs-days=0 \
- --loose-innodb_buffer_pool_load_at_startup=0 &
+ --loose-innodb_buffer_pool_load_at_startup=0 --skip-ssl &
  declare -g MARIADB_PID
  MARIADB_PID=$!
  mysql_note "Waiting for server startup"

diff --git a/11.5/docker-entrypoint.sh b/11.5/docker-entrypoint.sh
@@ -121,7 +121,7 @@ mysql_get_config() {
 docker_temp_server_start() {
  "$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
  --expire-logs-days=0 \
- --loose-innodb_buffer_pool_load_at_startup=0 &
+ --loose-innodb_buffer_pool_load_at_startup=0 --skip-ssl &
  declare -g MARIADB_PID
  MARIADB_PID=$!
  mysql_note "Waiting for server startup"

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -121,7 +121,7 @@ mysql_get_config() {
 docker_temp_server_start() {
  "$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
  --expire-logs-days=0 \
- --loose-innodb_buffer_pool_load_at_startup=0 &
+ --loose-innodb_buffer_pool_load_at_startup=0 --skip-ssl &
  declare -g MARIADB_PID
  MARIADB_PID=$!
  mysql_note "Waiting for server startup"