extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-06-18 07:47:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: unify mysql_connect_args condition logic

Browse Source 
- Refactored mysql_connect_args to be set under a single condition
This commit is contained in:
Marks Sunins 2025-05-09 10:01:48 +00:00
parent 7241127870
commit 9cfea015c8
No known key found for this signature in database
GPG Key ID: BADED4DBFD15F1A2
10 changed files with 40 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh
View File

@ -160,9 +160,12 @@ file_process_from_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables_mysql() { check_variables_mysql() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then if [ -n "${DB_SERVER_SOCKET}" ]; then
mysql_connect_args="-S ${DB_SERVER_SOCKET}"
else
: ${DB_SERVER_HOST:="mysql-server"} : ${DB_SERVER_HOST:="mysql-server"}
: ${DB_SERVER_PORT:="3306"} : ${DB_SERVER_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi fi
USE_DB_ROOT_USER=false USE_DB_ROOT_USER=false
@ -199,11 +202,6 @@ check_variables_mysql() {
DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix_proxy"} DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix_proxy"}
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() { db_tls_params() {

10
Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh
View File

@ -160,9 +160,12 @@ file_process_from_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables_mysql() { check_variables_mysql() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then if [ -n "${DB_SERVER_SOCKET}" ]; then
mysql_connect_args="-S ${DB_SERVER_SOCKET}"
else
: ${DB_SERVER_HOST:="mysql-server"} : ${DB_SERVER_HOST:="mysql-server"}
: ${DB_SERVER_PORT:="3306"} : ${DB_SERVER_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi fi
USE_DB_ROOT_USER=false USE_DB_ROOT_USER=false
@ -199,11 +202,6 @@ check_variables_mysql() {
DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix_proxy"} DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix_proxy"}
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() { db_tls_params() {

10
Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh
View File

@ -160,9 +160,12 @@ file_process_from_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables_mysql() { check_variables_mysql() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then if [ -n "${DB_SERVER_SOCKET}" ]; then
mysql_connect_args="-S ${DB_SERVER_SOCKET}"
else
: ${DB_SERVER_HOST:="mysql-server"} : ${DB_SERVER_HOST:="mysql-server"}
: ${DB_SERVER_PORT:="3306"} : ${DB_SERVER_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi fi
USE_DB_ROOT_USER=false USE_DB_ROOT_USER=false
@ -199,11 +202,6 @@ check_variables_mysql() {
DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix_proxy"} DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix_proxy"}
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() { db_tls_params() {

10
Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh
View File

@ -160,9 +160,12 @@ file_process_from_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables_mysql() { check_variables_mysql() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then if [ -n "${DB_SERVER_SOCKET}" ]; then
mysql_connect_args="-S ${DB_SERVER_SOCKET}"
else
: ${DB_SERVER_HOST:="mysql-server"} : ${DB_SERVER_HOST:="mysql-server"}
: ${DB_SERVER_PORT:="3306"} : ${DB_SERVER_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi fi
USE_DB_ROOT_USER=false USE_DB_ROOT_USER=false
@ -199,11 +202,6 @@ check_variables_mysql() {
DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix_proxy"} DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix_proxy"}
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() { db_tls_params() {

10
Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh
View File

@ -160,9 +160,12 @@ file_process_from_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables_mysql() { check_variables_mysql() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then if [ -n "${DB_SERVER_SOCKET}" ]; then
mysql_connect_args="-S ${DB_SERVER_SOCKET}"
else
: ${DB_SERVER_HOST:="mysql-server"} : ${DB_SERVER_HOST:="mysql-server"}
: ${DB_SERVER_PORT:="3306"} : ${DB_SERVER_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi fi
USE_DB_ROOT_USER=false USE_DB_ROOT_USER=false
@ -199,11 +202,6 @@ check_variables_mysql() {
DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix_proxy"} DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix_proxy"}
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() { db_tls_params() {

10
Dockerfiles/server-mysql/alpine/docker-entrypoint.sh
View File

@ -159,9 +159,12 @@ file_process_from_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables_mysql() { check_variables_mysql() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then if [ -n "${DB_SERVER_SOCKET}" ]; then
mysql_connect_args="-S ${DB_SERVER_SOCKET}"
else
: ${DB_SERVER_HOST:="mysql-server"} : ${DB_SERVER_HOST:="mysql-server"}
: ${DB_SERVER_PORT:="3306"} : ${DB_SERVER_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi fi
USE_DB_ROOT_USER=false USE_DB_ROOT_USER=false
@ -199,11 +202,6 @@ check_variables_mysql() {
DB_SERVER_DBNAME=${MYSQL_DATABASE:-"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() { db_tls_params() {

10
Dockerfiles/server-mysql/centos/docker-entrypoint.sh
View File

@ -159,9 +159,12 @@ file_process_from_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables_mysql() { check_variables_mysql() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then if [ -n "${DB_SERVER_SOCKET}" ]; then
mysql_connect_args="-S ${DB_SERVER_SOCKET}"
else
: ${DB_SERVER_HOST:="mysql-server"} : ${DB_SERVER_HOST:="mysql-server"}
: ${DB_SERVER_PORT:="3306"} : ${DB_SERVER_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi fi
USE_DB_ROOT_USER=false USE_DB_ROOT_USER=false
@ -199,11 +202,6 @@ check_variables_mysql() {
DB_SERVER_DBNAME=${MYSQL_DATABASE:-"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() { db_tls_params() {

10
Dockerfiles/server-mysql/ol/docker-entrypoint.sh
View File

@ -159,9 +159,12 @@ file_process_from_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables_mysql() { check_variables_mysql() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then if [ -n "${DB_SERVER_SOCKET}" ]; then
mysql_connect_args="-S ${DB_SERVER_SOCKET}"
else
: ${DB_SERVER_HOST:="mysql-server"} : ${DB_SERVER_HOST:="mysql-server"}
: ${DB_SERVER_PORT:="3306"} : ${DB_SERVER_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi fi
USE_DB_ROOT_USER=false USE_DB_ROOT_USER=false
@ -199,11 +202,6 @@ check_variables_mysql() {
DB_SERVER_DBNAME=${MYSQL_DATABASE:-"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() { db_tls_params() {

10
Dockerfiles/server-mysql/rhel/docker-entrypoint.sh
View File

@ -159,9 +159,12 @@ file_process_from_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables_mysql() { check_variables_mysql() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then if [ -n "${DB_SERVER_SOCKET}" ]; then
mysql_connect_args="-S ${DB_SERVER_SOCKET}"
else
: ${DB_SERVER_HOST:="mysql-server"} : ${DB_SERVER_HOST:="mysql-server"}
: ${DB_SERVER_PORT:="3306"} : ${DB_SERVER_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi fi
USE_DB_ROOT_USER=false USE_DB_ROOT_USER=false
@ -199,11 +202,6 @@ check_variables_mysql() {
DB_SERVER_DBNAME=${MYSQL_DATABASE:-"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() { db_tls_params() {

10
Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh
View File

@ -159,9 +159,12 @@ file_process_from_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables_mysql() { check_variables_mysql() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then if [ -n "${DB_SERVER_SOCKET}" ]; then
mysql_connect_args="-S ${DB_SERVER_SOCKET}"
else
: ${DB_SERVER_HOST:="mysql-server"} : ${DB_SERVER_HOST:="mysql-server"}
: ${DB_SERVER_PORT:="3306"} : ${DB_SERVER_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi fi
USE_DB_ROOT_USER=false USE_DB_ROOT_USER=false
@ -199,11 +202,6 @@ check_variables_mysql() {
DB_SERVER_DBNAME=${MYSQL_DATABASE:-"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() { db_tls_params() {