Skip to content

Commit

Permalink
Skip ssl on docker_temp_server_start
Browse files Browse the repository at this point in the history 
And checking it when seeing if the server is started.

Closes: MariaDB#592
  • Loading branch information
@grooverdan
grooverdan committed Jun 10, 2024
1 parent 43ea329 commit a01c93e
Show file tree
Hide file tree
Showing 13 changed files with 26 additions and 26 deletions.
4 changes: 2 additions & 2 deletions 10.11-ubi/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 --ssl-cert='' --ssl-key='' --ssl-ca='' &
declare -g MARIADB_PID
MARIADB_PID=$!
mysql_note "Waiting for server startup"
Expand All @@ -133,7 +133,7 @@ docker_temp_server_start() {
fi
local i
for i in {30..0}; do
if docker_process_sql "${extraArgs[@]}" --database=mysql <<<'SELECT 1' &> /dev/null; then
if docker_process_sql "${extraArgs[@]}" --database=mysql --skip-ssl --skip-ssl-verify-server-cert <<<'SELECT 1' &> /dev/null; then
break
fi
sleep 1
Expand Down
4 changes: 2 additions & 2 deletions 10.11/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 --ssl-cert='' --ssl-key='' --ssl-ca='' &
declare -g MARIADB_PID
MARIADB_PID=$!
mysql_note "Waiting for server startup"
Expand All @@ -133,7 +133,7 @@ docker_temp_server_start() {
fi
local i
for i in {30..0}; do
if docker_process_sql "${extraArgs[@]}" --database=mysql <<<'SELECT 1' &> /dev/null; then
if docker_process_sql "${extraArgs[@]}" --database=mysql --skip-ssl --skip-ssl-verify-server-cert <<<'SELECT 1' &> /dev/null; then
break
fi
sleep 1
Expand Down
4 changes: 2 additions & 2 deletions 10.4/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 --ssl-cert='' --ssl-key='' --ssl-ca='' &
declare -g MARIADB_PID
MARIADB_PID=$!
mysql_note "Waiting for server startup"
Expand All @@ -133,7 +133,7 @@ docker_temp_server_start() {
fi
local i
for i in {30..0}; do
if docker_process_sql "${extraArgs[@]}" --database=mysql <<<'SELECT 1' &> /dev/null; then
if docker_process_sql "${extraArgs[@]}" --database=mysql --skip-ssl --skip-ssl-verify-server-cert <<<'SELECT 1' &> /dev/null; then
break
fi
sleep 1
Expand Down
4 changes: 2 additions & 2 deletions 10.5/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 --ssl-cert='' --ssl-key='' --ssl-ca='' &
declare -g MARIADB_PID
MARIADB_PID=$!
mysql_note "Waiting for server startup"
Expand All @@ -133,7 +133,7 @@ docker_temp_server_start() {
fi
local i
for i in {30..0}; do
if docker_process_sql "${extraArgs[@]}" --database=mysql <<<'SELECT 1' &> /dev/null; then
if docker_process_sql "${extraArgs[@]}" --database=mysql --skip-ssl --skip-ssl-verify-server-cert <<<'SELECT 1' &> /dev/null; then
break
fi
sleep 1
Expand Down
4 changes: 2 additions & 2 deletions 10.6-ubi/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 --ssl-cert='' --ssl-key='' --ssl-ca='' &
declare -g MARIADB_PID
MARIADB_PID=$!
mysql_note "Waiting for server startup"
Expand All @@ -133,7 +133,7 @@ docker_temp_server_start() {
fi
local i
for i in {30..0}; do
if docker_process_sql "${extraArgs[@]}" --database=mysql <<<'SELECT 1' &> /dev/null; then
if docker_process_sql "${extraArgs[@]}" --database=mysql --skip-ssl --skip-ssl-verify-server-cert <<<'SELECT 1' &> /dev/null; then
break
fi
sleep 1
Expand Down
4 changes: 2 additions & 2 deletions 10.6/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 --ssl-cert='' --ssl-key='' --ssl-ca='' &
declare -g MARIADB_PID
MARIADB_PID=$!
mysql_note "Waiting for server startup"
Expand All @@ -133,7 +133,7 @@ docker_temp_server_start() {
fi
local i
for i in {30..0}; do
if docker_process_sql "${extraArgs[@]}" --database=mysql <<<'SELECT 1' &> /dev/null; then
if docker_process_sql "${extraArgs[@]}" --database=mysql --skip-ssl --skip-ssl-verify-server-cert <<<'SELECT 1' &> /dev/null; then
break
fi
sleep 1
Expand Down
4 changes: 2 additions & 2 deletions 11.1/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 --ssl-cert='' --ssl-key='' --ssl-ca='' &
declare -g MARIADB_PID
MARIADB_PID=$!
mysql_note "Waiting for server startup"
Expand All @@ -133,7 +133,7 @@ docker_temp_server_start() {
fi
local i
for i in {30..0}; do
if docker_process_sql "${extraArgs[@]}" --database=mysql <<<'SELECT 1' &> /dev/null; then
if docker_process_sql "${extraArgs[@]}" --database=mysql --skip-ssl --skip-ssl-verify-server-cert <<<'SELECT 1' &> /dev/null; then
break
fi
sleep 1
Expand Down
4 changes: 2 additions & 2 deletions 11.2/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 --ssl-cert='' --ssl-key='' --ssl-ca='' &
declare -g MARIADB_PID
MARIADB_PID=$!
mysql_note "Waiting for server startup"
Expand All @@ -133,7 +133,7 @@ docker_temp_server_start() {
fi
local i
for i in {30..0}; do
if docker_process_sql "${extraArgs[@]}" --database=mysql <<<'SELECT 1' &> /dev/null; then
if docker_process_sql "${extraArgs[@]}" --database=mysql --skip-ssl --skip-ssl-verify-server-cert <<<'SELECT 1' &> /dev/null; then
break
fi
sleep 1
Expand Down
4 changes: 2 additions & 2 deletions 11.4-ubi/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 --ssl-cert='' --ssl-key='' --ssl-ca='' &
declare -g MARIADB_PID
MARIADB_PID=$!
mysql_note "Waiting for server startup"
Expand All @@ -133,7 +133,7 @@ docker_temp_server_start() {
fi
local i
for i in {30..0}; do
if docker_process_sql "${extraArgs[@]}" --database=mysql <<<'SELECT 1' &> /dev/null; then
if docker_process_sql "${extraArgs[@]}" --database=mysql --skip-ssl --skip-ssl-verify-server-cert <<<'SELECT 1' &> /dev/null; then
break
fi
sleep 1
Expand Down
4 changes: 2 additions & 2 deletions 11.4/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 --ssl-cert='' --ssl-key='' --ssl-ca='' &
declare -g MARIADB_PID
MARIADB_PID=$!
mysql_note "Waiting for server startup"
Expand All @@ -133,7 +133,7 @@ docker_temp_server_start() {
fi
local i
for i in {30..0}; do
if docker_process_sql "${extraArgs[@]}" --database=mysql <<<'SELECT 1' &> /dev/null; then
if docker_process_sql "${extraArgs[@]}" --database=mysql --skip-ssl --skip-ssl-verify-server-cert <<<'SELECT 1' &> /dev/null; then
break
fi
sleep 1
Expand Down
4 changes: 2 additions & 2 deletions 11.5-ubi/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 --ssl-cert='' --ssl-key='' --ssl-ca='' &
declare -g MARIADB_PID
MARIADB_PID=$!
mysql_note "Waiting for server startup"
Expand All @@ -133,7 +133,7 @@ docker_temp_server_start() {
fi
local i
for i in {30..0}; do
if docker_process_sql "${extraArgs[@]}" --database=mysql <<<'SELECT 1' &> /dev/null; then
if docker_process_sql "${extraArgs[@]}" --database=mysql --skip-ssl --skip-ssl-verify-server-cert <<<'SELECT 1' &> /dev/null; then
break
fi
sleep 1
Expand Down
4 changes: 2 additions & 2 deletions 11.5/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 --ssl-cert='' --ssl-key='' --ssl-ca='' &
declare -g MARIADB_PID
MARIADB_PID=$!
mysql_note "Waiting for server startup"
Expand All @@ -133,7 +133,7 @@ docker_temp_server_start() {
fi
local i
for i in {30..0}; do
if docker_process_sql "${extraArgs[@]}" --database=mysql <<<'SELECT 1' &> /dev/null; then
if docker_process_sql "${extraArgs[@]}" --database=mysql --skip-ssl --skip-ssl-verify-server-cert <<<'SELECT 1' &> /dev/null; then
break
fi
sleep 1
Expand Down
4 changes: 2 additions & 2 deletions docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 --ssl-cert='' --ssl-key='' --ssl-ca='' &
declare -g MARIADB_PID
MARIADB_PID=$!
mysql_note "Waiting for server startup"
Expand All @@ -133,7 +133,7 @@ docker_temp_server_start() {
fi
local i
for i in {30..0}; do
if docker_process_sql "${extraArgs[@]}" --database=mysql <<<'SELECT 1' &> /dev/null; then
if docker_process_sql "${extraArgs[@]}" --database=mysql --skip-ssl --skip-ssl-verify-server-cert <<<'SELECT 1' &> /dev/null; then
break
fi
sleep 1
Expand Down

0 comments on commit a01c93e

Please sign in to comment.