extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-08-16 11:37:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1732 from zabbix/fix/7_4_mysql_db_variable_export

Browse Source 
fix: 7.4 MYSQL_DB variable export
This commit is contained in:
Alexey Pustovalov
2025-07-18 17:18:20 +09:00
committed by GitHub
parent 80ae6c771f d57938e075
commit b0a9e8ee00
18 changed files with 108 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfiles/web-apache-mysql/alpine/conf/etc/php84/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

@ -87,12 +87,14 @@ file_process_from_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
@ -102,11 +104,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() {
@ -240,8 +237,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

@ -87,12 +87,14 @@ file_process_from_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
@ -102,11 +104,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() {
@ -240,8 +237,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

@ -87,12 +87,14 @@ file_process_from_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
@ -102,11 +104,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() {
@ -240,8 +237,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

@ -87,12 +87,14 @@ file_process_from_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
@ -102,11 +104,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() {
@ -240,8 +237,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/php84/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

@ -93,12 +93,14 @@ file_process_from_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
@ -108,11 +110,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() {
@ -291,8 +288,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

@ -93,12 +93,14 @@ file_process_from_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
@ -108,11 +110,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() {
@ -291,8 +288,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

@ -93,12 +93,14 @@ file_process_from_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
@ -108,11 +110,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() {
@ -291,8 +288,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

@ -93,12 +93,14 @@ file_process_from_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
@ -108,11 +110,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() {
@ -291,8 +288,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

@ -93,12 +93,14 @@ file_process_from_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
@ -108,11 +110,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() {
@ -291,8 +288,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}