1berry/mariadb-docker
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

healthcheck for 11.4+ - skip tls validation

Browse Source 
In case of missing ssl-ca like #594
This commit is contained in:
Daniel Black 2024-06-11 12:35:20 +10:00
parent 0aa7324369
commit 11135d071f
6 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
11.4-ubi/healthcheck.sh
View File

@ -42,6 +42,7 @@ _process_sql()
${def['file']:+--defaults-file=${def['file']}} \ ${def['file']:+--defaults-file=${def['file']}} \
${def['extra_file']:+--defaults-extra-file=${def['extra_file']}} \ ${def['extra_file']:+--defaults-extra-file=${def['extra_file']}} \
${def['group_suffix']:+--defaults-group-suffix=${def['group_suffix']}} \ ${def['group_suffix']:+--defaults-group-suffix=${def['group_suffix']}} \
--skip-ssl --skip-ssl-verify-server-cert \
-B "$@" -B "$@"
} }
@ -62,6 +63,7 @@ connect()
${def['file']:+--defaults-file=${def['file']}} \ ${def['file']:+--defaults-file=${def['file']}} \
${def['extra_file']:+--defaults-extra-file=${def['extra_file']}} \ ${def['extra_file']:+--defaults-extra-file=${def['extra_file']}} \
${def['group_suffix']:+--defaults-group-suffix=${def['group_suffix']}} \ ${def['group_suffix']:+--defaults-group-suffix=${def['group_suffix']}} \
--skip-ssl --skip-ssl-verify-server-cert \
-h localhost --protocol tcp -e 'select 1' 2>&1 \ -h localhost --protocol tcp -e 'select 1' 2>&1 \
| grep -qF "Can't connect" | grep -qF "Can't connect"
local ret=${PIPESTATUS[1]} local ret=${PIPESTATUS[1]}

2
11.4/healthcheck.sh
View File

@ -42,6 +42,7 @@ _process_sql()
${def['file']:+--defaults-file=${def['file']}} \ ${def['file']:+--defaults-file=${def['file']}} \
${def['extra_file']:+--defaults-extra-file=${def['extra_file']}} \ ${def['extra_file']:+--defaults-extra-file=${def['extra_file']}} \
${def['group_suffix']:+--defaults-group-suffix=${def['group_suffix']}} \ ${def['group_suffix']:+--defaults-group-suffix=${def['group_suffix']}} \
--skip-ssl --skip-ssl-verify-server-cert \
-B "$@" -B "$@"
} }
@ -62,6 +63,7 @@ connect()
${def['file']:+--defaults-file=${def['file']}} \ ${def['file']:+--defaults-file=${def['file']}} \
${def['extra_file']:+--defaults-extra-file=${def['extra_file']}} \ ${def['extra_file']:+--defaults-extra-file=${def['extra_file']}} \
${def['group_suffix']:+--defaults-group-suffix=${def['group_suffix']}} \ ${def['group_suffix']:+--defaults-group-suffix=${def['group_suffix']}} \
--skip-ssl --skip-ssl-verify-server-cert \
-h localhost --protocol tcp -e 'select 1' 2>&1 \ -h localhost --protocol tcp -e 'select 1' 2>&1 \
| grep -qF "Can't connect" | grep -qF "Can't connect"
local ret=${PIPESTATUS[1]} local ret=${PIPESTATUS[1]}

2
11.5-ubi/healthcheck.sh
View File

@ -42,6 +42,7 @@ _process_sql()
${def['file']:+--defaults-file=${def['file']}} \ ${def['file']:+--defaults-file=${def['file']}} \
${def['extra_file']:+--defaults-extra-file=${def['extra_file']}} \ ${def['extra_file']:+--defaults-extra-file=${def['extra_file']}} \
${def['group_suffix']:+--defaults-group-suffix=${def['group_suffix']}} \ ${def['group_suffix']:+--defaults-group-suffix=${def['group_suffix']}} \
--skip-ssl --skip-ssl-verify-server-cert \
-B "$@" -B "$@"
} }
@ -62,6 +63,7 @@ connect()
${def['file']:+--defaults-file=${def['file']}} \ ${def['file']:+--defaults-file=${def['file']}} \
${def['extra_file']:+--defaults-extra-file=${def['extra_file']}} \ ${def['extra_file']:+--defaults-extra-file=${def['extra_file']}} \
${def['group_suffix']:+--defaults-group-suffix=${def['group_suffix']}} \ ${def['group_suffix']:+--defaults-group-suffix=${def['group_suffix']}} \
--skip-ssl --skip-ssl-verify-server-cert \
-h localhost --protocol tcp -e 'select 1' 2>&1 \ -h localhost --protocol tcp -e 'select 1' 2>&1 \
| grep -qF "Can't connect" | grep -qF "Can't connect"
local ret=${PIPESTATUS[1]} local ret=${PIPESTATUS[1]}

2
11.5/healthcheck.sh
View File

@ -42,6 +42,7 @@ _process_sql()
${def['file']:+--defaults-file=${def['file']}} \ ${def['file']:+--defaults-file=${def['file']}} \
${def['extra_file']:+--defaults-extra-file=${def['extra_file']}} \ ${def['extra_file']:+--defaults-extra-file=${def['extra_file']}} \
${def['group_suffix']:+--defaults-group-suffix=${def['group_suffix']}} \ ${def['group_suffix']:+--defaults-group-suffix=${def['group_suffix']}} \
--skip-ssl --skip-ssl-verify-server-cert \
-B "$@" -B "$@"
} }
@ -62,6 +63,7 @@ connect()
${def['file']:+--defaults-file=${def['file']}} \ ${def['file']:+--defaults-file=${def['file']}} \
${def['extra_file']:+--defaults-extra-file=${def['extra_file']}} \ ${def['extra_file']:+--defaults-extra-file=${def['extra_file']}} \
${def['group_suffix']:+--defaults-group-suffix=${def['group_suffix']}} \ ${def['group_suffix']:+--defaults-group-suffix=${def['group_suffix']}} \
--skip-ssl --skip-ssl-verify-server-cert \
-h localhost --protocol tcp -e 'select 1' 2>&1 \ -h localhost --protocol tcp -e 'select 1' 2>&1 \
| grep -qF "Can't connect" | grep -qF "Can't connect"
local ret=${PIPESTATUS[1]} local ret=${PIPESTATUS[1]}

2
healthcheck.sh
View File

@ -42,6 +42,7 @@ _process_sql()
${def['file']:+--defaults-file=${def['file']}} \ ${def['file']:+--defaults-file=${def['file']}} \
${def['extra_file']:+--defaults-extra-file=${def['extra_file']}} \ ${def['extra_file']:+--defaults-extra-file=${def['extra_file']}} \
${def['group_suffix']:+--defaults-group-suffix=${def['group_suffix']}} \ ${def['group_suffix']:+--defaults-group-suffix=${def['group_suffix']}} \
--skip-ssl --skip-ssl-verify-server-cert \
-B "$@" -B "$@"
} }
@ -62,6 +63,7 @@ connect()
${def['file']:+--defaults-file=${def['file']}} \ ${def['file']:+--defaults-file=${def['file']}} \
${def['extra_file']:+--defaults-extra-file=${def['extra_file']}} \ ${def['extra_file']:+--defaults-extra-file=${def['extra_file']}} \
${def['group_suffix']:+--defaults-group-suffix=${def['group_suffix']}} \ ${def['group_suffix']:+--defaults-group-suffix=${def['group_suffix']}} \
--skip-ssl --skip-ssl-verify-server-cert \
-h localhost --protocol tcp -e 'select 1' 2>&1 \ -h localhost --protocol tcp -e 'select 1' 2>&1 \
| grep -qF "Can't connect" | grep -qF "Can't connect"
local ret=${PIPESTATUS[1]} local ret=${PIPESTATUS[1]}

10
update.sh
View File

@ -87,11 +87,13 @@ update_version()
10.4) 10.4)
sed -i -e '/--old-mode/d' \ sed -i -e '/--old-mode/d' \
-e 's/REPLICATION REPLICA/REPLICATION SLAVE/' \ -e 's/REPLICATION REPLICA/REPLICATION SLAVE/' \
-e 's/START REPLICA/START SLAVE/' \ -e 's/START REPLICA/START SLAVE/' \
-e '/memory\.pressure/,+7d' \ -e '/memory\.pressure/,+7d' \
-e '/--skip-ssl/d' \ -e '/--skip-ssl/d' \
"$version/docker-entrypoint.sh" "$version/docker-entrypoint.sh"
sed -i -e 's/ REPLICA\$/ SLAVE$/' "$dir"/healthcheck.sh sed -i -e 's/ REPLICA\$/ SLAVE$/' \
-e '/--skip-ssl/d' \
"$dir"/healthcheck.sh
sed -i -e 's/\/run/\/var\/run\//g' "$dir/Dockerfile" sed -i -e 's/\/run/\/var\/run\//g' "$dir/Dockerfile"
;; # almost nothing to see/do here ;; # almost nothing to see/do here
10.5) 10.5)
@ -99,6 +101,8 @@ update_version()
-e '/--skip-ssl/d' \ -e '/--skip-ssl/d' \
-e '/memory\.pressure/,+7d' "$dir/docker-entrypoint.sh" -e '/memory\.pressure/,+7d' "$dir/docker-entrypoint.sh"
sed -i '/backwards compat/d' "$dir/Dockerfile" sed -i '/backwards compat/d' "$dir/Dockerfile"
sed -i -e '/--skip-ssl/d' \
"$dir"/healthcheck.sh
;; ;;
*) *)
sed -i -e '/^CMD/s/mysqld/mariadbd/' \ sed -i -e '/^CMD/s/mysqld/mariadbd/' \
@ -130,7 +134,7 @@ update_version()
sed -i -e '/memory\.pressure/,+7d' "$dir/docker-entrypoint.sh" sed -i -e '/memory\.pressure/,+7d' "$dir/docker-entrypoint.sh"
fi fi
if [[ $vmin = 10.* || $vmin =~ 11.[12] ]]; then if [[ $vmin = 10.* || $vmin =~ 11.[12] ]]; then
sed -i -e '/--skip-ssl/d' "$dir/docker-entrypoint.sh" sed -i -e '/--skip-ssl/d' "$dir/docker-entrypoint.sh" "$dir/healthcheck.sh"
fi fi
if [[ $vmin =~ 11.[012345] ]]; then if [[ $vmin =~ 11.[012345] ]]; then
sed -i -e 's/mysql_upgrade_info/mariadb_upgrade_info/' \ sed -i -e 's/mysql_upgrade_info/mariadb_upgrade_info/' \