From d57938e075d5a88120053f1a7cd7853984cab351 Mon Sep 17 00:00:00 2001 From: Marks Sunins Date: Thu, 15 May 2025 12:37:40 +0000 Subject: [PATCH] feat: set php mysqli socket to user provided value --- .../alpine/conf/etc/php84/php-fpm.d/zabbix.conf | 3 +++ Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh | 7 ++++--- .../web-nginx-mysql/centos/conf/etc/php-fpm.d/zabbix.conf | 3 +++ Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh | 7 ++++--- .../web-nginx-mysql/ol/conf/etc/php-fpm.d/zabbix.conf | 3 +++ Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh | 7 ++++--- .../web-nginx-mysql/rhel/conf/etc/php-fpm.d/zabbix.conf | 3 +++ Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh | 7 ++++--- .../ubuntu/conf/etc/php/8.3/fpm/pool.d/zabbix.conf | 3 +++ Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh | 7 ++++--- 10 files changed, 35 insertions(+), 15 deletions(-) diff --git a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php84/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php84/php-fpm.d/zabbix.conf index 66c3c1252..4ee70ccd0 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php84/php-fpm.d/zabbix.conf +++ b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php84/php-fpm.d/zabbix.conf @@ -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} diff --git a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh index d9617e0bb..b1adc188e 100755 --- a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh @@ -93,12 +93,12 @@ file_process_from_env() { # Check prerequisites for MySQL database check_variables() { - : ${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"} + : ${DB_SERVER_PORT:="3306"} mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}" fi @@ -288,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} diff --git a/Dockerfiles/web-nginx-mysql/centos/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-mysql/centos/conf/etc/php-fpm.d/zabbix.conf index 66c3c1252..4ee70ccd0 100644 --- a/Dockerfiles/web-nginx-mysql/centos/conf/etc/php-fpm.d/zabbix.conf +++ b/Dockerfiles/web-nginx-mysql/centos/conf/etc/php-fpm.d/zabbix.conf @@ -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} diff --git a/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh index 2cc76dae0..0b7b83612 100755 --- a/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh @@ -93,12 +93,12 @@ file_process_from_env() { # Check prerequisites for MySQL database check_variables() { - : ${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"} + : ${DB_SERVER_PORT:="3306"} mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}" fi @@ -288,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} diff --git a/Dockerfiles/web-nginx-mysql/ol/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-mysql/ol/conf/etc/php-fpm.d/zabbix.conf index 66c3c1252..4ee70ccd0 100644 --- a/Dockerfiles/web-nginx-mysql/ol/conf/etc/php-fpm.d/zabbix.conf +++ b/Dockerfiles/web-nginx-mysql/ol/conf/etc/php-fpm.d/zabbix.conf @@ -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} diff --git a/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh index 2cc76dae0..0b7b83612 100755 --- a/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh @@ -93,12 +93,12 @@ file_process_from_env() { # Check prerequisites for MySQL database check_variables() { - : ${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"} + : ${DB_SERVER_PORT:="3306"} mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}" fi @@ -288,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} diff --git a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/php-fpm.d/zabbix.conf index 66c3c1252..4ee70ccd0 100644 --- a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/php-fpm.d/zabbix.conf +++ b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/php-fpm.d/zabbix.conf @@ -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} diff --git a/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh index 2cc76dae0..0b7b83612 100755 --- a/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh @@ -93,12 +93,12 @@ file_process_from_env() { # Check prerequisites for MySQL database check_variables() { - : ${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"} + : ${DB_SERVER_PORT:="3306"} mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}" fi @@ -288,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} diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.3/fpm/pool.d/zabbix.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.3/fpm/pool.d/zabbix.conf index 66c3c1252..4ee70ccd0 100644 --- a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.3/fpm/pool.d/zabbix.conf +++ b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.3/fpm/pool.d/zabbix.conf @@ -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} diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh index ac67e5b03..2878d9e3c 100755 --- a/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh @@ -93,12 +93,12 @@ file_process_from_env() { # Check prerequisites for MySQL database check_variables() { - : ${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"} + : ${DB_SERVER_PORT:="3306"} mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}" fi @@ -288,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}