From 430994cfd84c0979e21ed81e5c617b1a37ae782a Mon Sep 17 00:00:00 2001
From: Marks Sunins <marks.sunins@zabbix.com>
Date: Fri, 9 May 2025 10:01:48 +0000
Subject: [PATCH 1/4] refactor: unify mysql_connect_args condition logic -
 Refactored mysql_connect_args to be set under a single condition

---
 Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh  | 10 ++++------
 Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh  | 10 ++++------
 Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh      | 10 ++++------
 Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh    | 10 ++++------
 Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh  | 10 ++++------
 Dockerfiles/server-mysql/alpine/docker-entrypoint.sh | 10 ++++------
 Dockerfiles/server-mysql/centos/docker-entrypoint.sh | 10 ++++------
 Dockerfiles/server-mysql/ol/docker-entrypoint.sh     | 10 ++++------
 Dockerfiles/server-mysql/rhel/docker-entrypoint.sh   | 10 ++++------
 Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh | 10 ++++------
 10 files changed, 40 insertions(+), 60 deletions(-)

diff --git a/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh
index c76e91525..d02c0e88a 100755
--- a/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh
@@ -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() {
diff --git a/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh
index c6706640a..46b9abc50 100755
--- a/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh
@@ -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() {
diff --git a/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh
index d08049c38..ef5043fea 100755
--- a/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh
@@ -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() {
diff --git a/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh
index c6706640a..46b9abc50 100755
--- a/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh
@@ -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() {
diff --git a/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh
index c6706640a..46b9abc50 100755
--- a/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh
@@ -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() {
diff --git a/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh
index 1edc3f671..1b2a4705c 100755
--- a/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh
@@ -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() {
diff --git a/Dockerfiles/server-mysql/centos/docker-entrypoint.sh b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh
index ed61897fe..d739d705f 100755
--- a/Dockerfiles/server-mysql/centos/docker-entrypoint.sh
+++ b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh
@@ -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() {
diff --git a/Dockerfiles/server-mysql/ol/docker-entrypoint.sh b/Dockerfiles/server-mysql/ol/docker-entrypoint.sh
index ed61897fe..d739d705f 100755
--- a/Dockerfiles/server-mysql/ol/docker-entrypoint.sh
+++ b/Dockerfiles/server-mysql/ol/docker-entrypoint.sh
@@ -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() {
diff --git a/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh
index ed61897fe..d739d705f 100755
--- a/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh
+++ b/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh
@@ -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() {
diff --git a/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh
index ed61897fe..d739d705f 100755
--- a/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh
@@ -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() {

From a63ac5a428d146f013ecc250827f69737b7d3799 Mon Sep 17 00:00:00 2001
From: Marks Sunins <marks.sunins@zabbix.com>
Date: Fri, 9 May 2025 11:38:16 +0000
Subject: [PATCH 2/4] refactor: unify mysql_connect_args in web-frontend

- Refactored mysql_connect_args to be set under a single condition
---
 .../alpine/docker-entrypoint.sh                 | 17 +++++++----------
 .../centos/docker-entrypoint.sh                 | 17 +++++++----------
 .../web-apache-mysql/ol/docker-entrypoint.sh    | 17 +++++++----------
 .../ubuntu/docker-entrypoint.sh                 | 17 +++++++----------
 .../web-nginx-mysql/alpine/docker-entrypoint.sh | 17 +++++++----------
 .../web-nginx-mysql/centos/docker-entrypoint.sh | 17 +++++++----------
 .../web-nginx-mysql/ol/docker-entrypoint.sh     | 17 +++++++----------
 .../web-nginx-mysql/rhel/docker-entrypoint.sh   | 17 +++++++----------
 .../web-nginx-mysql/ubuntu/docker-entrypoint.sh | 17 +++++++----------
 9 files changed, 63 insertions(+), 90 deletions(-)

diff --git a/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh
index 9b2fe6a20..e54dfd90a 100755
--- a/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh
@@ -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
-        DB_SERVER_HOST="localhost"
-    fi
     : ${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"}
+        mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
+    fi
 
     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() {
diff --git a/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh
index 89abf28a1..5daee7e49 100755
--- a/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh
+++ b/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh
@@ -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
-        DB_SERVER_HOST="localhost"
-    fi
     : ${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"}
+        mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
+    fi
 
     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() {
diff --git a/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh
index 89abf28a1..5daee7e49 100755
--- a/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh
+++ b/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh
@@ -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
-        DB_SERVER_HOST="localhost"
-    fi
     : ${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"}
+        mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
+    fi
 
     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() {
diff --git a/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh
index 4b0b1fa3f..fbbd99e62 100755
--- a/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh
@@ -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
-        DB_SERVER_HOST="localhost"
-    fi
     : ${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"}
+        mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
+    fi
 
     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() {
diff --git a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh
index 34cf26879..771e8bdc9 100755
--- a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh
@@ -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
-        DB_SERVER_HOST="localhost"
-    fi
     : ${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"}
+        mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
+    fi
 
     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() {
diff --git a/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh
index 45b21095f..60e68bcb4 100755
--- a/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh
@@ -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
-        DB_SERVER_HOST="localhost"
-    fi
     : ${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"}
+        mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
+    fi
 
     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() {
diff --git a/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh
index 45b21095f..60e68bcb4 100755
--- a/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh
@@ -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
-        DB_SERVER_HOST="localhost"
-    fi
     : ${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"}
+        mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
+    fi
 
     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() {
diff --git a/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh
index 45b21095f..60e68bcb4 100755
--- a/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh
@@ -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
-        DB_SERVER_HOST="localhost"
-    fi
     : ${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"}
+        mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
+    fi
 
     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() {
diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh
index d475455d0..4cd9d402a 100755
--- a/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh
@@ -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
-        DB_SERVER_HOST="localhost"
-    fi
     : ${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"}
+        mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
+    fi
 
     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() {

From cd59fe67d6e0664215d31befb6f37eab32fe6f4f Mon Sep 17 00:00:00 2001
From: Marks Sunins <marks.sunins@zabbix.com>
Date: Thu, 15 May 2025 09:41:26 +0000
Subject: [PATCH 3/4] feat: set php mysqli socket to user provided value

---
 .../alpine/conf/etc/php83/php-fpm.d/zabbix.conf            | 3 +++
 Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh   | 7 ++++---
 .../web-apache-mysql/centos/conf/etc/php-fpm.d/zabbix.conf | 3 +++
 Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh   | 7 ++++---
 .../web-apache-mysql/ol/conf/etc/php-fpm.d/zabbix.conf     | 3 +++
 Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh       | 7 ++++---
 .../ubuntu/conf/etc/php/8.3/fpm/pool.d/zabbix.conf         | 3 +++
 Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh   | 7 ++++---
 8 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/Dockerfiles/web-apache-mysql/alpine/conf/etc/php83/php-fpm.d/zabbix.conf b/Dockerfiles/web-apache-mysql/alpine/conf/etc/php83/php-fpm.d/zabbix.conf
index 66c3c1252..4ee70ccd0 100644
--- a/Dockerfiles/web-apache-mysql/alpine/conf/etc/php83/php-fpm.d/zabbix.conf
+++ b/Dockerfiles/web-apache-mysql/alpine/conf/etc/php83/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 e54dfd90a..f890f4ab9 100755
--- a/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh
@@ -68,12 +68,12 @@ file_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
 
@@ -213,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}
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 5daee7e49..aa9ef63fc 100755
--- a/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh
+++ b/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh
@@ -68,12 +68,12 @@ file_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
 
@@ -213,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}
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 5daee7e49..aa9ef63fc 100755
--- a/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh
+++ b/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh
@@ -68,12 +68,12 @@ file_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
 
@@ -213,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}
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 fbbd99e62..e8b84f0eb 100755
--- a/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh
@@ -68,12 +68,12 @@ file_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
 
@@ -213,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}

From 41ddc84b86d309cc9905e5e39abe49bce195f3c8 Mon Sep 17 00:00:00 2001
From: Marks Sunins <marks.sunins@zabbix.com>
Date: Thu, 15 May 2025 12:37:40 +0000
Subject: [PATCH 4/4] feat: set php mysqli socket to user provided value

---
 .../alpine/conf/etc/php83/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/php83/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php83/php-fpm.d/zabbix.conf
index 66c3c1252..4ee70ccd0 100644
--- a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php83/php-fpm.d/zabbix.conf
+++ b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php83/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 771e8bdc9..a6cc61937 100755
--- a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh
@@ -65,12 +65,12 @@ file_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
 
@@ -239,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}
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 60e68bcb4..a2801706c 100755
--- a/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh
@@ -65,12 +65,12 @@ file_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
 
@@ -239,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}
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 60e68bcb4..a2801706c 100755
--- a/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh
@@ -65,12 +65,12 @@ file_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
 
@@ -239,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}
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 60e68bcb4..a2801706c 100755
--- a/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh
@@ -65,12 +65,12 @@ file_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
 
@@ -239,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}
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 4cd9d402a..c211e776e 100755
--- a/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh
@@ -65,12 +65,12 @@ file_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
 
@@ -239,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}