extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-06-20 09:57:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: unify mysql_connect_args in web-frontend

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

17
Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh
View File

@ -68,12 +68,14 @@ file_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables() { check_variables() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then
: ${DB_SERVER_HOST:="mysql-server"}
else
DB_SERVER_HOST="localhost"
fi
: ${DB_SERVER_PORT:="3306"} : ${DB_SERVER_PORT:="3306"}
if [ -n "${DB_SERVER_SOCKET}" ]; then
mysql_connect_args="-S ${DB_SERVER_SOCKET}"
DB_SERVER_HOST="localhost"
else
: ${DB_SERVER_HOST:="mysql-server"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi
file_env MYSQL_USER file_env MYSQL_USER
file_env MYSQL_PASSWORD file_env MYSQL_PASSWORD
@ -83,11 +85,6 @@ check_variables() {
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() {

17
Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh
View File

@ -68,12 +68,14 @@ file_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables() { check_variables() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then
: ${DB_SERVER_HOST:="mysql-server"}
else
DB_SERVER_HOST="localhost"
fi
: ${DB_SERVER_PORT:="3306"} : ${DB_SERVER_PORT:="3306"}
if [ -n "${DB_SERVER_SOCKET}" ]; then
mysql_connect_args="-S ${DB_SERVER_SOCKET}"
DB_SERVER_HOST="localhost"
else
: ${DB_SERVER_HOST:="mysql-server"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi
file_env MYSQL_USER file_env MYSQL_USER
file_env MYSQL_PASSWORD file_env MYSQL_PASSWORD
@ -83,11 +85,6 @@ check_variables() {
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() {

17
Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh
View File

@ -68,12 +68,14 @@ file_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables() { check_variables() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then
: ${DB_SERVER_HOST:="mysql-server"}
else
DB_SERVER_HOST="localhost"
fi
: ${DB_SERVER_PORT:="3306"} : ${DB_SERVER_PORT:="3306"}
if [ -n "${DB_SERVER_SOCKET}" ]; then
mysql_connect_args="-S ${DB_SERVER_SOCKET}"
DB_SERVER_HOST="localhost"
else
: ${DB_SERVER_HOST:="mysql-server"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi
file_env MYSQL_USER file_env MYSQL_USER
file_env MYSQL_PASSWORD file_env MYSQL_PASSWORD
@ -83,11 +85,6 @@ check_variables() {
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() {

17
Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh
View File

@ -68,12 +68,14 @@ file_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables() { check_variables() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then
: ${DB_SERVER_HOST:="mysql-server"}
else
DB_SERVER_HOST="localhost"
fi
: ${DB_SERVER_PORT:="3306"} : ${DB_SERVER_PORT:="3306"}
if [ -n "${DB_SERVER_SOCKET}" ]; then
mysql_connect_args="-S ${DB_SERVER_SOCKET}"
DB_SERVER_HOST="localhost"
else
: ${DB_SERVER_HOST:="mysql-server"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi
file_env MYSQL_USER file_env MYSQL_USER
file_env MYSQL_PASSWORD file_env MYSQL_PASSWORD
@ -83,11 +85,6 @@ check_variables() {
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() {

17
Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh
View File

@ -65,12 +65,14 @@ file_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables() { check_variables() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then
: ${DB_SERVER_HOST:="mysql-server"}
else
DB_SERVER_HOST="localhost"
fi
: ${DB_SERVER_PORT:="3306"} : ${DB_SERVER_PORT:="3306"}
if [ -n "${DB_SERVER_SOCKET}" ]; then
mysql_connect_args="-S ${DB_SERVER_SOCKET}"
DB_SERVER_HOST="localhost"
else
: ${DB_SERVER_HOST:="mysql-server"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi
file_env MYSQL_USER file_env MYSQL_USER
file_env MYSQL_PASSWORD file_env MYSQL_PASSWORD
@ -80,11 +82,6 @@ check_variables() {
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() {

17
Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh
View File

@ -65,12 +65,14 @@ file_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables() { check_variables() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then
: ${DB_SERVER_HOST:="mysql-server"}
else
DB_SERVER_HOST="localhost"
fi
: ${DB_SERVER_PORT:="3306"} : ${DB_SERVER_PORT:="3306"}
if [ -n "${DB_SERVER_SOCKET}" ]; then
mysql_connect_args="-S ${DB_SERVER_SOCKET}"
DB_SERVER_HOST="localhost"
else
: ${DB_SERVER_HOST:="mysql-server"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi
file_env MYSQL_USER file_env MYSQL_USER
file_env MYSQL_PASSWORD file_env MYSQL_PASSWORD
@ -80,11 +82,6 @@ check_variables() {
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() {

17
Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh
View File

@ -65,12 +65,14 @@ file_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables() { check_variables() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then
: ${DB_SERVER_HOST:="mysql-server"}
else
DB_SERVER_HOST="localhost"
fi
: ${DB_SERVER_PORT:="3306"} : ${DB_SERVER_PORT:="3306"}
if [ -n "${DB_SERVER_SOCKET}" ]; then
mysql_connect_args="-S ${DB_SERVER_SOCKET}"
DB_SERVER_HOST="localhost"
else
: ${DB_SERVER_HOST:="mysql-server"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi
file_env MYSQL_USER file_env MYSQL_USER
file_env MYSQL_PASSWORD file_env MYSQL_PASSWORD
@ -80,11 +82,6 @@ check_variables() {
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() {

17
Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh
View File

@ -65,12 +65,14 @@ file_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables() { check_variables() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then
: ${DB_SERVER_HOST:="mysql-server"}
else
DB_SERVER_HOST="localhost"
fi
: ${DB_SERVER_PORT:="3306"} : ${DB_SERVER_PORT:="3306"}
if [ -n "${DB_SERVER_SOCKET}" ]; then
mysql_connect_args="-S ${DB_SERVER_SOCKET}"
DB_SERVER_HOST="localhost"
else
: ${DB_SERVER_HOST:="mysql-server"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi
file_env MYSQL_USER file_env MYSQL_USER
file_env MYSQL_PASSWORD file_env MYSQL_PASSWORD
@ -80,11 +82,6 @@ check_variables() {
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() {

17
Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh
View File

@ -65,12 +65,14 @@ file_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables() { check_variables() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then
: ${DB_SERVER_HOST:="mysql-server"}
else
DB_SERVER_HOST="localhost"
fi
: ${DB_SERVER_PORT:="3306"} : ${DB_SERVER_PORT:="3306"}
if [ -n "${DB_SERVER_SOCKET}" ]; then
mysql_connect_args="-S ${DB_SERVER_SOCKET}"
DB_SERVER_HOST="localhost"
else
: ${DB_SERVER_HOST:="mysql-server"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi
file_env MYSQL_USER file_env MYSQL_USER
file_env MYSQL_PASSWORD file_env MYSQL_PASSWORD
@ -80,11 +82,6 @@ check_variables() {
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() {