mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2025-06-30 14:51:11 +02:00
Fixed MySQL socket usage
This commit is contained in:
@ -67,6 +67,12 @@ check_variables() {
|
||||
DB_SERVER_ZBX_PASS=${MYSQL_PASSWORD:-"zabbix"}
|
||||
|
||||
DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix"}
|
||||
|
||||
if [ ! -n "${DB_SERVER_SOCKET}" ]; then
|
||||
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
|
||||
else
|
||||
mysql_connect_args="-S ${DB_SERVER_SOCKET}"
|
||||
fi
|
||||
}
|
||||
|
||||
db_tls_params() {
|
||||
@ -95,6 +101,9 @@ check_db_connect() {
|
||||
echo "********************"
|
||||
echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}"
|
||||
echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}"
|
||||
if [ -n "${DB_SERVER_SOCKET}" ]; then
|
||||
echo "* DB_SERVER_SOCKET: ${DB_SERVER_SOCKET}"
|
||||
fi
|
||||
echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}"
|
||||
if [ "${DEBUG_MODE,,}" == "true" ]; then
|
||||
echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}"
|
||||
@ -108,7 +117,7 @@ check_db_connect() {
|
||||
|
||||
export MYSQL_PWD="${DB_SERVER_ZBX_PASS}"
|
||||
|
||||
while [ ! "$(mysqladmin ping -h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} -u ${DB_SERVER_ZBX_USER} \
|
||||
while [ ! "$(mysqladmin ping $mysql_connect_args -u ${DB_SERVER_ZBX_USER} \
|
||||
--silent --connect_timeout=10 $ssl_opts)" ]; do
|
||||
echo "**** MySQL server is not available. Waiting $WAIT_TIMEOUT seconds..."
|
||||
sleep $WAIT_TIMEOUT
|
||||
|
@ -67,6 +67,12 @@ check_variables() {
|
||||
DB_SERVER_ZBX_PASS=${MYSQL_PASSWORD:-"zabbix"}
|
||||
|
||||
DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix"}
|
||||
|
||||
if [ ! -n "${DB_SERVER_SOCKET}" ]; then
|
||||
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
|
||||
else
|
||||
mysql_connect_args="-S ${DB_SERVER_SOCKET}"
|
||||
fi
|
||||
}
|
||||
|
||||
db_tls_params() {
|
||||
@ -95,6 +101,9 @@ check_db_connect() {
|
||||
echo "********************"
|
||||
echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}"
|
||||
echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}"
|
||||
if [ -n "${DB_SERVER_SOCKET}" ]; then
|
||||
echo "* DB_SERVER_SOCKET: ${DB_SERVER_SOCKET}"
|
||||
fi
|
||||
echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}"
|
||||
if [ "${DEBUG_MODE,,}" == "true" ]; then
|
||||
echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}"
|
||||
@ -108,7 +117,7 @@ check_db_connect() {
|
||||
|
||||
export MYSQL_PWD="${DB_SERVER_ZBX_PASS}"
|
||||
|
||||
while [ ! "$(mysqladmin ping -h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} -u ${DB_SERVER_ZBX_USER} \
|
||||
while [ ! "$(mysqladmin ping $mysql_connect_args -u ${DB_SERVER_ZBX_USER} \
|
||||
--silent --connect_timeout=10 $ssl_opts)" ]; do
|
||||
echo "**** MySQL server is not available. Waiting $WAIT_TIMEOUT seconds..."
|
||||
sleep $WAIT_TIMEOUT
|
||||
|
@ -67,6 +67,12 @@ check_variables() {
|
||||
DB_SERVER_ZBX_PASS=${MYSQL_PASSWORD:-"zabbix"}
|
||||
|
||||
DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix"}
|
||||
|
||||
if [ ! -n "${DB_SERVER_SOCKET}" ]; then
|
||||
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
|
||||
else
|
||||
mysql_connect_args="-S ${DB_SERVER_SOCKET}"
|
||||
fi
|
||||
}
|
||||
|
||||
db_tls_params() {
|
||||
@ -95,6 +101,9 @@ check_db_connect() {
|
||||
echo "********************"
|
||||
echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}"
|
||||
echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}"
|
||||
if [ -n "${DB_SERVER_SOCKET}" ]; then
|
||||
echo "* DB_SERVER_SOCKET: ${DB_SERVER_SOCKET}"
|
||||
fi
|
||||
echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}"
|
||||
if [ "${DEBUG_MODE,,}" == "true" ]; then
|
||||
echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}"
|
||||
@ -108,7 +117,7 @@ check_db_connect() {
|
||||
|
||||
export MYSQL_PWD="${DB_SERVER_ZBX_PASS}"
|
||||
|
||||
while [ ! "$(mysqladmin ping -h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} -u ${DB_SERVER_ZBX_USER} \
|
||||
while [ ! "$(mysqladmin ping $mysql_connect_args -u ${DB_SERVER_ZBX_USER} \
|
||||
--silent --connect_timeout=10 $ssl_opts)" ]; do
|
||||
echo "**** MySQL server is not available. Waiting $WAIT_TIMEOUT seconds..."
|
||||
sleep $WAIT_TIMEOUT
|
||||
|
@ -67,6 +67,12 @@ check_variables() {
|
||||
DB_SERVER_ZBX_PASS=${MYSQL_PASSWORD:-"zabbix"}
|
||||
|
||||
DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix"}
|
||||
|
||||
if [ ! -n "${DB_SERVER_SOCKET}" ]; then
|
||||
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
|
||||
else
|
||||
mysql_connect_args="-S ${DB_SERVER_SOCKET}"
|
||||
fi
|
||||
}
|
||||
|
||||
db_tls_params() {
|
||||
@ -95,6 +101,9 @@ check_db_connect() {
|
||||
echo "********************"
|
||||
echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}"
|
||||
echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}"
|
||||
if [ -n "${DB_SERVER_SOCKET}" ]; then
|
||||
echo "* DB_SERVER_SOCKET: ${DB_SERVER_SOCKET}"
|
||||
fi
|
||||
echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}"
|
||||
if [ "${DEBUG_MODE,,}" == "true" ]; then
|
||||
echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}"
|
||||
@ -108,7 +117,7 @@ check_db_connect() {
|
||||
|
||||
export MYSQL_PWD="${DB_SERVER_ZBX_PASS}"
|
||||
|
||||
while [ ! "$(mysqladmin ping -h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} -u ${DB_SERVER_ZBX_USER} \
|
||||
while [ ! "$(mysqladmin ping $mysql_connect_args -u ${DB_SERVER_ZBX_USER} \
|
||||
--silent --connect_timeout=10 $ssl_opts)" ]; do
|
||||
echo "**** MySQL server is not available. Waiting $WAIT_TIMEOUT seconds..."
|
||||
sleep $WAIT_TIMEOUT
|
||||
|
Reference in New Issue
Block a user