Andrey/zabbix-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1736 from zabbix/fix/6_0_mysql_db_variable_export

Browse Source 
fix: 6.0 mysql db variable export
This commit is contained in:
Alexey Pustovalov 2025-07-19 15:21:50 +09:00 committed by GitHub
commit e8045fb5de
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
28 changed files with 148 additions and 159 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

@ -159,9 +159,12 @@ file_process_from_env() {
# Check prerequisites for MySQL database
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_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi
USE_DB_ROOT_USER=false
@ -198,11 +201,6 @@ check_variables_mysql() {
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() {

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

@ -159,9 +159,12 @@ file_process_from_env() {
# Check prerequisites for MySQL database
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_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi
USE_DB_ROOT_USER=false
@ -198,11 +201,6 @@ check_variables_mysql() {
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() {

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

@ -159,9 +159,12 @@ file_process_from_env() {
# Check prerequisites for MySQL database
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_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi
USE_DB_ROOT_USER=false
@ -198,11 +201,6 @@ check_variables_mysql() {
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() {

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

@ -159,9 +159,12 @@ file_process_from_env() {
# Check prerequisites for MySQL database
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_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi
USE_DB_ROOT_USER=false
@ -198,11 +201,6 @@ check_variables_mysql() {
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() {

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

@ -159,9 +159,12 @@ file_process_from_env() {
# Check prerequisites for MySQL database
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_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi
USE_DB_ROOT_USER=false
@ -198,11 +201,6 @@ check_variables_mysql() {
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() {

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

@ -156,9 +156,12 @@ file_process_from_env() {
# Check prerequisites for MySQL database
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_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi
USE_DB_ROOT_USER=false
@ -195,11 +198,6 @@ check_variables_mysql() {
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() {

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

@ -156,9 +156,12 @@ file_process_from_env() {
# Check prerequisites for MySQL database
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_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi
USE_DB_ROOT_USER=false
@ -195,11 +198,6 @@ check_variables_mysql() {
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() {

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

@ -156,9 +156,12 @@ file_process_from_env() {
# Check prerequisites for MySQL database
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_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi
USE_DB_ROOT_USER=false
@ -195,11 +198,6 @@ check_variables_mysql() {
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() {

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

@ -156,9 +156,12 @@ file_process_from_env() {
# Check prerequisites for MySQL database
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_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi
USE_DB_ROOT_USER=false
@ -195,11 +198,6 @@ check_variables_mysql() {
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() {

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

@ -156,9 +156,12 @@ file_process_from_env() {
# Check prerequisites for MySQL database
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_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi
USE_DB_ROOT_USER=false
@ -195,11 +198,6 @@ check_variables_mysql() {
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() {

3
Dockerfiles/web-apache-mysql/alpine/conf/etc/php83/php-fpm.d/zabbix.conf
View File

@ -34,3 +34,6 @@ php_value[date.timezone] = ${PHP_TZ}
; PHP-FPM monitoring
pm.status_path = /status
ping.path = /ping
; Set the socket equal to DB_SERVER_SOCKET set by user
php_value[mysqli.default_socket] = ${DB_SERVER_SOCKET}

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

@ -68,12 +68,14 @@ file_env() {
# Check prerequisites for MySQL database
check_variables() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then
: ${DB_SERVER_HOST:="mysql-server"}
else
if [ -n "${DB_SERVER_SOCKET}" ]; then
mysql_connect_args="-S ${DB_SERVER_SOCKET}"
DB_SERVER_HOST="localhost"
else
: ${DB_SERVER_HOST:="mysql-server"}
: ${DB_SERVER_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi
: ${DB_SERVER_PORT:="3306"}
file_env MYSQL_USER
file_env MYSQL_PASSWORD
@ -83,11 +85,6 @@ check_variables() {
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() {
@ -216,8 +213,9 @@ prepare_zbx_php_config() {
export PHP_TZ=${PHP_TZ}
export DB_SERVER_TYPE="MYSQL"
export DB_SERVER_HOST=${DB_SERVER_HOST}
export DB_SERVER_PORT=${DB_SERVER_PORT}
test -z "${DB_SERVER_HOST}" || export DB_SERVER_HOST
test -z "${DB_SERVER_PORT}" || export DB_SERVER_PORT
test -z "${DB_SERVER_SOCKET}" || export DB_SERVER_SOCKET
export DB_SERVER_DBNAME=${DB_SERVER_DBNAME}
export DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA}
export DB_SERVER_USER=${DB_SERVER_ZBX_USER}

3
Dockerfiles/web-apache-mysql/centos/conf/etc/php-fpm.d/zabbix.conf
View File

@ -34,3 +34,6 @@ php_value[date.timezone] = ${PHP_TZ}
; PHP-FPM monitoring
pm.status_path = /status
ping.path = /ping
; Set the socket equal to DB_SERVER_SOCKET set by user
php_value[mysqli.default_socket] = ${DB_SERVER_SOCKET}

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

@ -68,12 +68,14 @@ file_env() {
# Check prerequisites for MySQL database
check_variables() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then
: ${DB_SERVER_HOST:="mysql-server"}
else
if [ -n "${DB_SERVER_SOCKET}" ]; then
mysql_connect_args="-S ${DB_SERVER_SOCKET}"
DB_SERVER_HOST="localhost"
else
: ${DB_SERVER_HOST:="mysql-server"}
: ${DB_SERVER_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi
: ${DB_SERVER_PORT:="3306"}
file_env MYSQL_USER
file_env MYSQL_PASSWORD
@ -83,11 +85,6 @@ check_variables() {
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() {
@ -216,8 +213,9 @@ prepare_zbx_php_config() {
export PHP_TZ=${PHP_TZ}
export DB_SERVER_TYPE="MYSQL"
export DB_SERVER_HOST=${DB_SERVER_HOST}
export DB_SERVER_PORT=${DB_SERVER_PORT}
test -z "${DB_SERVER_HOST}" || export DB_SERVER_HOST
test -z "${DB_SERVER_PORT}" || export DB_SERVER_PORT
test -z "${DB_SERVER_SOCKET}" || export DB_SERVER_SOCKET
export DB_SERVER_DBNAME=${DB_SERVER_DBNAME}
export DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA}
export DB_SERVER_USER=${DB_SERVER_ZBX_USER}

3
Dockerfiles/web-apache-mysql/ol/conf/etc/php-fpm.d/zabbix.conf
View File

@ -34,3 +34,6 @@ php_value[date.timezone] = ${PHP_TZ}
; PHP-FPM monitoring
pm.status_path = /status
ping.path = /ping
; Set the socket equal to DB_SERVER_SOCKET set by user
php_value[mysqli.default_socket] = ${DB_SERVER_SOCKET}

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

@ -68,12 +68,14 @@ file_env() {
# Check prerequisites for MySQL database
check_variables() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then
: ${DB_SERVER_HOST:="mysql-server"}
else
if [ -n "${DB_SERVER_SOCKET}" ]; then
mysql_connect_args="-S ${DB_SERVER_SOCKET}"
DB_SERVER_HOST="localhost"
else
: ${DB_SERVER_HOST:="mysql-server"}
: ${DB_SERVER_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi
: ${DB_SERVER_PORT:="3306"}
file_env MYSQL_USER
file_env MYSQL_PASSWORD
@ -83,11 +85,6 @@ check_variables() {
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() {
@ -216,8 +213,9 @@ prepare_zbx_php_config() {
export PHP_TZ=${PHP_TZ}
export DB_SERVER_TYPE="MYSQL"
export DB_SERVER_HOST=${DB_SERVER_HOST}
export DB_SERVER_PORT=${DB_SERVER_PORT}
test -z "${DB_SERVER_HOST}" || export DB_SERVER_HOST
test -z "${DB_SERVER_PORT}" || export DB_SERVER_PORT
test -z "${DB_SERVER_SOCKET}" || export DB_SERVER_SOCKET
export DB_SERVER_DBNAME=${DB_SERVER_DBNAME}
export DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA}
export DB_SERVER_USER=${DB_SERVER_ZBX_USER}

3
Dockerfiles/web-apache-mysql/ubuntu/conf/etc/php/8.3/fpm/pool.d/zabbix.conf
View File

@ -34,3 +34,6 @@ php_value[date.timezone] = ${PHP_TZ}
; PHP-FPM monitoring
pm.status_path = /status
ping.path = /ping
; Set the socket equal to DB_SERVER_SOCKET set by user
php_value[mysqli.default_socket] = ${DB_SERVER_SOCKET}

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

@ -68,12 +68,14 @@ file_env() {
# Check prerequisites for MySQL database
check_variables() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then
: ${DB_SERVER_HOST:="mysql-server"}
else
if [ -n "${DB_SERVER_SOCKET}" ]; then
mysql_connect_args="-S ${DB_SERVER_SOCKET}"
DB_SERVER_HOST="localhost"
else
: ${DB_SERVER_HOST:="mysql-server"}
: ${DB_SERVER_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi
: ${DB_SERVER_PORT:="3306"}
file_env MYSQL_USER
file_env MYSQL_PASSWORD
@ -83,11 +85,6 @@ check_variables() {
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() {
@ -216,8 +213,9 @@ prepare_zbx_php_config() {
export PHP_TZ=${PHP_TZ}
export DB_SERVER_TYPE="MYSQL"
export DB_SERVER_HOST=${DB_SERVER_HOST}
export DB_SERVER_PORT=${DB_SERVER_PORT}
test -z "${DB_SERVER_HOST}" || export DB_SERVER_HOST
test -z "${DB_SERVER_PORT}" || export DB_SERVER_PORT
test -z "${DB_SERVER_SOCKET}" || export DB_SERVER_SOCKET
export DB_SERVER_DBNAME=${DB_SERVER_DBNAME}
export DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA}
export DB_SERVER_USER=${DB_SERVER_ZBX_USER}

3
Dockerfiles/web-nginx-mysql/alpine/conf/etc/php83/php-fpm.d/zabbix.conf
View File

@ -34,3 +34,6 @@ php_value[date.timezone] = ${PHP_TZ}
; PHP-FPM monitoring
pm.status_path = /status
ping.path = /ping
; Set the socket equal to DB_SERVER_SOCKET set by user
php_value[mysqli.default_socket] = ${DB_SERVER_SOCKET}

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

@ -65,12 +65,14 @@ file_env() {
# Check prerequisites for MySQL database
check_variables() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then
: ${DB_SERVER_HOST:="mysql-server"}
else
if [ -n "${DB_SERVER_SOCKET}" ]; then
mysql_connect_args="-S ${DB_SERVER_SOCKET}"
DB_SERVER_HOST="localhost"
else
: ${DB_SERVER_HOST:="mysql-server"}
: ${DB_SERVER_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi
: ${DB_SERVER_PORT:="3306"}
file_env MYSQL_USER
file_env MYSQL_PASSWORD
@ -80,11 +82,6 @@ check_variables() {
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() {
@ -242,8 +239,9 @@ prepare_zbx_php_config() {
export PHP_TZ=${PHP_TZ}
export DB_SERVER_TYPE="MYSQL"
export DB_SERVER_HOST=${DB_SERVER_HOST}
export DB_SERVER_PORT=${DB_SERVER_PORT}
test -z "${DB_SERVER_HOST}" || export DB_SERVER_HOST
test -z "${DB_SERVER_PORT}" || export DB_SERVER_PORT
test -z "${DB_SERVER_SOCKET}" || export DB_SERVER_SOCKET
export DB_SERVER_DBNAME=${DB_SERVER_DBNAME}
export DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA}
export DB_SERVER_USER=${DB_SERVER_ZBX_USER}

3
Dockerfiles/web-nginx-mysql/centos/conf/etc/php-fpm.d/zabbix.conf
View File

@ -34,3 +34,6 @@ php_value[date.timezone] = ${PHP_TZ}
; PHP-FPM monitoring
pm.status_path = /status
ping.path = /ping
; Set the socket equal to DB_SERVER_SOCKET set by user
php_value[mysqli.default_socket] = ${DB_SERVER_SOCKET}

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

@ -65,12 +65,14 @@ file_env() {
# Check prerequisites for MySQL database
check_variables() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then
: ${DB_SERVER_HOST:="mysql-server"}
else
if [ -n "${DB_SERVER_SOCKET}" ]; then
mysql_connect_args="-S ${DB_SERVER_SOCKET}"
DB_SERVER_HOST="localhost"
else
: ${DB_SERVER_HOST:="mysql-server"}
: ${DB_SERVER_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi
: ${DB_SERVER_PORT:="3306"}
file_env MYSQL_USER
file_env MYSQL_PASSWORD
@ -80,11 +82,6 @@ check_variables() {
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() {
@ -242,8 +239,9 @@ prepare_zbx_php_config() {
export PHP_TZ=${PHP_TZ}
export DB_SERVER_TYPE="MYSQL"
export DB_SERVER_HOST=${DB_SERVER_HOST}
export DB_SERVER_PORT=${DB_SERVER_PORT}
test -z "${DB_SERVER_HOST}" || export DB_SERVER_HOST
test -z "${DB_SERVER_PORT}" || export DB_SERVER_PORT
test -z "${DB_SERVER_SOCKET}" || export DB_SERVER_SOCKET
export DB_SERVER_DBNAME=${DB_SERVER_DBNAME}
export DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA}
export DB_SERVER_USER=${DB_SERVER_ZBX_USER}

3
Dockerfiles/web-nginx-mysql/ol/conf/etc/php-fpm.d/zabbix.conf
View File

@ -34,3 +34,6 @@ php_value[date.timezone] = ${PHP_TZ}
; PHP-FPM monitoring
pm.status_path = /status
ping.path = /ping
; Set the socket equal to DB_SERVER_SOCKET set by user
php_value[mysqli.default_socket] = ${DB_SERVER_SOCKET}

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

@ -65,12 +65,14 @@ file_env() {
# Check prerequisites for MySQL database
check_variables() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then
: ${DB_SERVER_HOST:="mysql-server"}
else
if [ -n "${DB_SERVER_SOCKET}" ]; then
mysql_connect_args="-S ${DB_SERVER_SOCKET}"
DB_SERVER_HOST="localhost"
else
: ${DB_SERVER_HOST:="mysql-server"}
: ${DB_SERVER_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi
: ${DB_SERVER_PORT:="3306"}
file_env MYSQL_USER
file_env MYSQL_PASSWORD
@ -80,11 +82,6 @@ check_variables() {
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() {
@ -242,8 +239,9 @@ prepare_zbx_php_config() {
export PHP_TZ=${PHP_TZ}
export DB_SERVER_TYPE="MYSQL"
export DB_SERVER_HOST=${DB_SERVER_HOST}
export DB_SERVER_PORT=${DB_SERVER_PORT}
test -z "${DB_SERVER_HOST}" || export DB_SERVER_HOST
test -z "${DB_SERVER_PORT}" || export DB_SERVER_PORT
test -z "${DB_SERVER_SOCKET}" || export DB_SERVER_SOCKET
export DB_SERVER_DBNAME=${DB_SERVER_DBNAME}
export DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA}
export DB_SERVER_USER=${DB_SERVER_ZBX_USER}

3
Dockerfiles/web-nginx-mysql/rhel/conf/etc/php-fpm.d/zabbix.conf
View File

@ -34,3 +34,6 @@ php_value[date.timezone] = ${PHP_TZ}
; PHP-FPM monitoring
pm.status_path = /status
ping.path = /ping
; Set the socket equal to DB_SERVER_SOCKET set by user
php_value[mysqli.default_socket] = ${DB_SERVER_SOCKET}

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

@ -65,12 +65,14 @@ file_env() {
# Check prerequisites for MySQL database
check_variables() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then
: ${DB_SERVER_HOST:="mysql-server"}
else
if [ -n "${DB_SERVER_SOCKET}" ]; then
mysql_connect_args="-S ${DB_SERVER_SOCKET}"
DB_SERVER_HOST="localhost"
else
: ${DB_SERVER_HOST:="mysql-server"}
: ${DB_SERVER_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi
: ${DB_SERVER_PORT:="3306"}
file_env MYSQL_USER
file_env MYSQL_PASSWORD
@ -80,11 +82,6 @@ check_variables() {
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() {
@ -242,8 +239,9 @@ prepare_zbx_php_config() {
export PHP_TZ=${PHP_TZ}
export DB_SERVER_TYPE="MYSQL"
export DB_SERVER_HOST=${DB_SERVER_HOST}
export DB_SERVER_PORT=${DB_SERVER_PORT}
test -z "${DB_SERVER_HOST}" || export DB_SERVER_HOST
test -z "${DB_SERVER_PORT}" || export DB_SERVER_PORT
test -z "${DB_SERVER_SOCKET}" || export DB_SERVER_SOCKET
export DB_SERVER_DBNAME=${DB_SERVER_DBNAME}
export DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA}
export DB_SERVER_USER=${DB_SERVER_ZBX_USER}

3
Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.3/fpm/pool.d/zabbix.conf
View File

@ -34,3 +34,6 @@ php_value[date.timezone] = ${PHP_TZ}
; PHP-FPM monitoring
pm.status_path = /status
ping.path = /ping
; Set the socket equal to DB_SERVER_SOCKET set by user
php_value[mysqli.default_socket] = ${DB_SERVER_SOCKET}

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

@ -65,12 +65,14 @@ file_env() {
# Check prerequisites for MySQL database
check_variables() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then
: ${DB_SERVER_HOST:="mysql-server"}
else
if [ -n "${DB_SERVER_SOCKET}" ]; then
mysql_connect_args="-S ${DB_SERVER_SOCKET}"
DB_SERVER_HOST="localhost"
else
: ${DB_SERVER_HOST:="mysql-server"}
: ${DB_SERVER_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi
: ${DB_SERVER_PORT:="3306"}
file_env MYSQL_USER
file_env MYSQL_PASSWORD
@ -80,11 +82,6 @@ check_variables() {
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() {
@ -242,8 +239,9 @@ prepare_zbx_php_config() {
export PHP_TZ=${PHP_TZ}
export DB_SERVER_TYPE="MYSQL"
export DB_SERVER_HOST=${DB_SERVER_HOST}
export DB_SERVER_PORT=${DB_SERVER_PORT}
test -z "${DB_SERVER_HOST}" || export DB_SERVER_HOST
test -z "${DB_SERVER_PORT}" || export DB_SERVER_PORT
test -z "${DB_SERVER_SOCKET}" || export DB_SERVER_SOCKET
export DB_SERVER_DBNAME=${DB_SERVER_DBNAME}
export DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA}
export DB_SERVER_USER=${DB_SERVER_ZBX_USER}