extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-06-19 08:17:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: set php mysqli socket to user provided value

Browse Source
This commit is contained in:
Marks Sunins 2025-05-15 12:37:40 +00:00
parent de0d18784a
commit d06ed961b3
No known key found for this signature in database
GPG Key ID: BADED4DBFD15F1A2
10 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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 ; PHP-FPM monitoring
pm.status_path = /status pm.status_path = /status
ping.path = /ping ping.path = /ping
; Set the socket equal to DB_SERVER_SOCKET set by user
php_value[mysqli.default_socket] = ${DB_SERVER_SOCKET}

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

@ -65,12 +65,12 @@ file_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables() { check_variables() {
: ${DB_SERVER_PORT:="3306"}
if [ -n "${DB_SERVER_SOCKET}" ]; then if [ -n "${DB_SERVER_SOCKET}" ]; then
mysql_connect_args="-S ${DB_SERVER_SOCKET}" mysql_connect_args="-S ${DB_SERVER_SOCKET}"
DB_SERVER_HOST="localhost" DB_SERVER_HOST="localhost"
else else
: ${DB_SERVER_HOST:="mysql-server"} : ${DB_SERVER_HOST:="mysql-server"}
: ${DB_SERVER_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}" mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi fi
@ -239,8 +239,9 @@ prepare_zbx_php_config() {
export PHP_TZ=${PHP_TZ} export PHP_TZ=${PHP_TZ}
export DB_SERVER_TYPE="MYSQL" export DB_SERVER_TYPE="MYSQL"
export DB_SERVER_HOST=${DB_SERVER_HOST} test -z "${DB_SERVER_HOST}" || export DB_SERVER_HOST
export DB_SERVER_PORT=${DB_SERVER_PORT} 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_DBNAME=${DB_SERVER_DBNAME}
export DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA} export DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA}
export DB_SERVER_USER=${DB_SERVER_ZBX_USER} 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 ; PHP-FPM monitoring
pm.status_path = /status pm.status_path = /status
ping.path = /ping ping.path = /ping
; Set the socket equal to DB_SERVER_SOCKET set by user
php_value[mysqli.default_socket] = ${DB_SERVER_SOCKET}

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

@ -65,12 +65,12 @@ file_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables() { check_variables() {
: ${DB_SERVER_PORT:="3306"}
if [ -n "${DB_SERVER_SOCKET}" ]; then if [ -n "${DB_SERVER_SOCKET}" ]; then
mysql_connect_args="-S ${DB_SERVER_SOCKET}" mysql_connect_args="-S ${DB_SERVER_SOCKET}"
DB_SERVER_HOST="localhost" DB_SERVER_HOST="localhost"
else else
: ${DB_SERVER_HOST:="mysql-server"} : ${DB_SERVER_HOST:="mysql-server"}
: ${DB_SERVER_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}" mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi fi
@ -239,8 +239,9 @@ prepare_zbx_php_config() {
export PHP_TZ=${PHP_TZ} export PHP_TZ=${PHP_TZ}
export DB_SERVER_TYPE="MYSQL" export DB_SERVER_TYPE="MYSQL"
export DB_SERVER_HOST=${DB_SERVER_HOST} test -z "${DB_SERVER_HOST}" || export DB_SERVER_HOST
export DB_SERVER_PORT=${DB_SERVER_PORT} 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_DBNAME=${DB_SERVER_DBNAME}
export DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA} export DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA}
export DB_SERVER_USER=${DB_SERVER_ZBX_USER} 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 ; PHP-FPM monitoring
pm.status_path = /status pm.status_path = /status
ping.path = /ping ping.path = /ping
; Set the socket equal to DB_SERVER_SOCKET set by user
php_value[mysqli.default_socket] = ${DB_SERVER_SOCKET}

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

@ -65,12 +65,12 @@ file_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables() { check_variables() {
: ${DB_SERVER_PORT:="3306"}
if [ -n "${DB_SERVER_SOCKET}" ]; then if [ -n "${DB_SERVER_SOCKET}" ]; then
mysql_connect_args="-S ${DB_SERVER_SOCKET}" mysql_connect_args="-S ${DB_SERVER_SOCKET}"
DB_SERVER_HOST="localhost" DB_SERVER_HOST="localhost"
else else
: ${DB_SERVER_HOST:="mysql-server"} : ${DB_SERVER_HOST:="mysql-server"}
: ${DB_SERVER_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}" mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi fi
@ -239,8 +239,9 @@ prepare_zbx_php_config() {
export PHP_TZ=${PHP_TZ} export PHP_TZ=${PHP_TZ}
export DB_SERVER_TYPE="MYSQL" export DB_SERVER_TYPE="MYSQL"
export DB_SERVER_HOST=${DB_SERVER_HOST} test -z "${DB_SERVER_HOST}" || export DB_SERVER_HOST
export DB_SERVER_PORT=${DB_SERVER_PORT} 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_DBNAME=${DB_SERVER_DBNAME}
export DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA} export DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA}
export DB_SERVER_USER=${DB_SERVER_ZBX_USER} 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 ; PHP-FPM monitoring
pm.status_path = /status pm.status_path = /status
ping.path = /ping ping.path = /ping
; Set the socket equal to DB_SERVER_SOCKET set by user
php_value[mysqli.default_socket] = ${DB_SERVER_SOCKET}

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

@ -65,12 +65,12 @@ file_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables() { check_variables() {
: ${DB_SERVER_PORT:="3306"}
if [ -n "${DB_SERVER_SOCKET}" ]; then if [ -n "${DB_SERVER_SOCKET}" ]; then
mysql_connect_args="-S ${DB_SERVER_SOCKET}" mysql_connect_args="-S ${DB_SERVER_SOCKET}"
DB_SERVER_HOST="localhost" DB_SERVER_HOST="localhost"
else else
: ${DB_SERVER_HOST:="mysql-server"} : ${DB_SERVER_HOST:="mysql-server"}
: ${DB_SERVER_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}" mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi fi
@ -239,8 +239,9 @@ prepare_zbx_php_config() {
export PHP_TZ=${PHP_TZ} export PHP_TZ=${PHP_TZ}
export DB_SERVER_TYPE="MYSQL" export DB_SERVER_TYPE="MYSQL"
export DB_SERVER_HOST=${DB_SERVER_HOST} test -z "${DB_SERVER_HOST}" || export DB_SERVER_HOST
export DB_SERVER_PORT=${DB_SERVER_PORT} 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_DBNAME=${DB_SERVER_DBNAME}
export DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA} export DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA}
export DB_SERVER_USER=${DB_SERVER_ZBX_USER} 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 ; PHP-FPM monitoring
pm.status_path = /status pm.status_path = /status
ping.path = /ping ping.path = /ping
; Set the socket equal to DB_SERVER_SOCKET set by user
php_value[mysqli.default_socket] = ${DB_SERVER_SOCKET}

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

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