Skip to content

Commit

Permalink
Fixed warning messages on Alpine (mysql->mariadb) during SQL queries
Browse files Browse the repository at this point in the history
  • Loading branch information
dotneft committed Dec 20, 2024
1 parent 56ff038 commit a56a0ea
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,8 @@ check_db_connect_mysql() {

export MYSQL_PWD="${DB_SERVER_ROOT_PASS}"

while [ ! "$(mysqladmin ping $mysql_connect_args -u ${DB_SERVER_ROOT_USER} \
--silent --connect_timeout=10 $ssl_opts)" ]; do
while [ ! "$(mariadb-admin ping $mysql_connect_args -u ${DB_SERVER_ROOT_USER} \
--silent --skip-ssl-verify-server-cert --connect_timeout=10 $ssl_opts)" ]; do
echo "**** MySQL server is not available. Waiting $WAIT_TIMEOUT seconds..."
sleep $WAIT_TIMEOUT
done
Expand All @@ -271,7 +271,7 @@ mysql_query() {

export MYSQL_PWD="${DB_SERVER_ROOT_PASS}"

result=$(mysql --silent --skip-column-names $mysql_connect_args \
result=$(mariadb --silent --skip-column-names --skip-ssl-verify-server-cert $mysql_connect_args \
-u ${DB_SERVER_ROOT_USER} -e "$query" $ssl_opts)

unset MYSQL_PWD
Expand All @@ -292,7 +292,7 @@ exec_sql_file() {
command="zcat"
fi

$command "$sql_script" | mysql --silent --skip-column-names \
$command "$sql_script" | mariadb --silent --skip-column-names --skip-ssl-verify-server-cert \
--default-character-set=${DB_CHARACTER_SET} \
$mysql_connect_args \
-u ${DB_SERVER_ROOT_USER} $ssl_opts \
Expand Down
8 changes: 4 additions & 4 deletions Dockerfiles/server-mysql/alpine/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -251,8 +251,8 @@ check_db_connect_mysql() {

export MYSQL_PWD="${DB_SERVER_ROOT_PASS}"

while [ ! "$(mysqladmin ping $mysql_connect_args -u ${DB_SERVER_ROOT_USER} \
--silent --connect_timeout=10 $ssl_opts)" ]; do
while [ ! "$(mariadb-admin ping $mysql_connect_args -u ${DB_SERVER_ROOT_USER} \
--silent --skip-ssl-verify-server-cert --connect_timeout=10 $ssl_opts)" ]; do
echo "**** MySQL server is not available. Waiting $WAIT_TIMEOUT seconds..."
sleep $WAIT_TIMEOUT
done
Expand All @@ -268,7 +268,7 @@ mysql_query() {

export MYSQL_PWD="${DB_SERVER_ROOT_PASS}"

result=$(mysql --silent --skip-column-names $mysql_connect_args \
result=$(mariadb --silent --skip-column-names --skip-ssl-verify-server-cert $mysql_connect_args \
-u ${DB_SERVER_ROOT_USER} -e "$query" $ssl_opts)

unset MYSQL_PWD
Expand All @@ -289,7 +289,7 @@ exec_sql_file() {
command="zcat"
fi

$command "$sql_script" | mysql --silent --skip-column-names \
$command "$sql_script" | mariadb --silent --skip-column-names --skip-ssl-verify-server-cert \
--default-character-set=${DB_CHARACTER_SET} \
$mysql_connect_args \
-u ${DB_SERVER_ROOT_USER} $ssl_opts \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ check_db_connect() {

export MYSQL_PWD="${DB_SERVER_ZBX_PASS}"

while [ ! "$(mysqladmin ping $mysql_connect_args -u ${DB_SERVER_ZBX_USER} \
--silent --connect_timeout=10 $ssl_opts)" ]; do
while [ ! "$(mariadb-admin ping $mysql_connect_args -u ${DB_SERVER_ZBX_USER} \
--silent --skip-ssl-verify-server-cert --connect_timeout=10 $ssl_opts)" ]; do
echo "**** MySQL server is not available. Waiting $WAIT_TIMEOUT seconds..."
sleep $WAIT_TIMEOUT
done
Expand Down
4 changes: 2 additions & 2 deletions Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ check_db_connect() {

export MYSQL_PWD="${DB_SERVER_ZBX_PASS}"

while [ ! "$(mysqladmin ping $mysql_connect_args -u ${DB_SERVER_ZBX_USER} \
--silent --connect_timeout=10 $ssl_opts)" ]; do
while [ ! "$(mariadb-admin ping $mysql_connect_args -u ${DB_SERVER_ZBX_USER} \
--silent --skip-ssl-verify-server-cert --connect_timeout=10 $ssl_opts)" ]; do
echo "**** MySQL server is not available. Waiting $WAIT_TIMEOUT seconds..."
sleep $WAIT_TIMEOUT
done
Expand Down

0 comments on commit a56a0ea

Please sign in to comment.