diff --git a/Dockerfiles/web-apache-mysql/alpine/conf/etc/php84/php-fpm.d/zabbix.conf b/Dockerfiles/web-apache-mysql/alpine/conf/etc/php84/php-fpm.d/zabbix.conf index 66c3c1252..4ee70ccd0 100644 --- a/Dockerfiles/web-apache-mysql/alpine/conf/etc/php84/php-fpm.d/zabbix.conf +++ b/Dockerfiles/web-apache-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-apache-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh index 13925f122..3d76eac9b 100755 --- a/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh @@ -87,12 +87,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 @@ -237,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} diff --git a/Dockerfiles/web-apache-mysql/centos/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-apache-mysql/centos/conf/etc/php-fpm.d/zabbix.conf index 66c3c1252..4ee70ccd0 100644 --- a/Dockerfiles/web-apache-mysql/centos/conf/etc/php-fpm.d/zabbix.conf +++ b/Dockerfiles/web-apache-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-apache-mysql/centos/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh index 6cd473960..99354d6dc 100755 --- a/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh @@ -87,12 +87,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 @@ -237,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} diff --git a/Dockerfiles/web-apache-mysql/ol/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-apache-mysql/ol/conf/etc/php-fpm.d/zabbix.conf index 66c3c1252..4ee70ccd0 100644 --- a/Dockerfiles/web-apache-mysql/ol/conf/etc/php-fpm.d/zabbix.conf +++ b/Dockerfiles/web-apache-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-apache-mysql/ol/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh index 6cd473960..99354d6dc 100755 --- a/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh @@ -87,12 +87,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 @@ -237,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} diff --git a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/php/8.3/fpm/pool.d/zabbix.conf b/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/php/8.3/fpm/pool.d/zabbix.conf index 66c3c1252..4ee70ccd0 100644 --- a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/php/8.3/fpm/pool.d/zabbix.conf +++ b/Dockerfiles/web-apache-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-apache-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh index 24736ed62..d1686736d 100755 --- a/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh @@ -87,12 +87,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 @@ -237,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}