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

Merge pull request #1692 from zabbix/fix/ZBX-25968/wrong-DBPort-value

Browse Source 
Fix #1628 unset MYSQL_DB variables being exported
This commit is contained in:
Alexey Pustovalov
2025-05-17 19:30:26 +09:00
committed by GitHub
parent 488dc0a1fd d06ed961b3
commit ccd700a419
31 changed files with 191 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh
View File

@@ -160,9 +160,12 @@ file_process_from_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables_mysql() { 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_HOST:="mysql-server"}
: ${DB_SERVER_PORT:="3306"} : ${DB_SERVER_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi fi
USE_DB_ROOT_USER=false USE_DB_ROOT_USER=false
@@ -199,11 +202,6 @@ check_variables_mysql() {
DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix_proxy"} 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() { db_tls_params() {
@@ -349,11 +347,10 @@ create_db_schema_mysql() {
} }
update_zbx_config() { update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}" test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
export ZBX_DB_PORT="${DB_SERVER_PORT}" test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
if [ -n "${DB_SERVER_SOCKET}" ]; then test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}" export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

19
Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh
View File

@@ -160,9 +160,12 @@ file_process_from_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables_mysql() { 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_HOST:="mysql-server"}
: ${DB_SERVER_PORT:="3306"} : ${DB_SERVER_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi fi
USE_DB_ROOT_USER=false USE_DB_ROOT_USER=false
@@ -199,11 +202,6 @@ check_variables_mysql() {
DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix_proxy"} 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() { db_tls_params() {
@@ -346,11 +344,10 @@ create_db_schema_mysql() {
} }
update_zbx_config() { update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}" test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
export ZBX_DB_PORT="${DB_SERVER_PORT}" test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
if [ -n "${DB_SERVER_SOCKET}" ]; then test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}" export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

19
Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh
View File

@@ -160,9 +160,12 @@ file_process_from_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables_mysql() { 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_HOST:="mysql-server"}
: ${DB_SERVER_PORT:="3306"} : ${DB_SERVER_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi fi
USE_DB_ROOT_USER=false USE_DB_ROOT_USER=false
@@ -199,11 +202,6 @@ check_variables_mysql() {
DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix_proxy"} 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() { db_tls_params() {
@@ -346,11 +344,10 @@ create_db_schema_mysql() {
} }
update_zbx_config() { update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}" test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
export ZBX_DB_PORT="${DB_SERVER_PORT}" test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
if [ -n "${DB_SERVER_SOCKET}" ]; then test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}" export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

19
Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh
View File

@@ -160,9 +160,12 @@ file_process_from_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables_mysql() { 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_HOST:="mysql-server"}
: ${DB_SERVER_PORT:="3306"} : ${DB_SERVER_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi fi
USE_DB_ROOT_USER=false USE_DB_ROOT_USER=false
@@ -199,11 +202,6 @@ check_variables_mysql() {
DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix_proxy"} 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() { db_tls_params() {
@@ -346,11 +344,10 @@ create_db_schema_mysql() {
} }
update_zbx_config() { update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}" test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
export ZBX_DB_PORT="${DB_SERVER_PORT}" test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
if [ -n "${DB_SERVER_SOCKET}" ]; then test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}" export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

19
Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh
View File

@@ -160,9 +160,12 @@ file_process_from_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables_mysql() { 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_HOST:="mysql-server"}
: ${DB_SERVER_PORT:="3306"} : ${DB_SERVER_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi fi
USE_DB_ROOT_USER=false USE_DB_ROOT_USER=false
@@ -199,11 +202,6 @@ check_variables_mysql() {
DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix_proxy"} 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() { db_tls_params() {
@@ -346,11 +344,10 @@ create_db_schema_mysql() {
} }
update_zbx_config() { update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}" test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
export ZBX_DB_PORT="${DB_SERVER_PORT}" test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
if [ -n "${DB_SERVER_SOCKET}" ]; then test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}" export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

19
Dockerfiles/server-mysql/alpine/docker-entrypoint.sh
View File

@@ -159,9 +159,12 @@ file_process_from_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables_mysql() { 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_HOST:="mysql-server"}
: ${DB_SERVER_PORT:="3306"} : ${DB_SERVER_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi fi
USE_DB_ROOT_USER=false USE_DB_ROOT_USER=false
@@ -199,11 +202,6 @@ check_variables_mysql() {
DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix"} 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() { db_tls_params() {
@@ -362,11 +360,10 @@ create_db_schema_mysql() {
} }
update_zbx_config() { update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}" test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
export ZBX_DB_PORT="${DB_SERVER_PORT}" test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
if [ -n "${DB_SERVER_SOCKET}" ]; then test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}" export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

19
Dockerfiles/server-mysql/centos/docker-entrypoint.sh
View File

@@ -159,9 +159,12 @@ file_process_from_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables_mysql() { 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_HOST:="mysql-server"}
: ${DB_SERVER_PORT:="3306"} : ${DB_SERVER_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi fi
USE_DB_ROOT_USER=false USE_DB_ROOT_USER=false
@@ -199,11 +202,6 @@ check_variables_mysql() {
DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix"} 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() { db_tls_params() {
@@ -359,11 +357,10 @@ create_db_schema_mysql() {
} }
update_zbx_config() { update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}" test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
export ZBX_DB_PORT="${DB_SERVER_PORT}" test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
if [ -n "${DB_SERVER_SOCKET}" ]; then test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}" export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

19
Dockerfiles/server-mysql/ol/docker-entrypoint.sh
View File

@@ -159,9 +159,12 @@ file_process_from_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables_mysql() { 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_HOST:="mysql-server"}
: ${DB_SERVER_PORT:="3306"} : ${DB_SERVER_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi fi
USE_DB_ROOT_USER=false USE_DB_ROOT_USER=false
@@ -199,11 +202,6 @@ check_variables_mysql() {
DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix"} 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() { db_tls_params() {
@@ -359,11 +357,10 @@ create_db_schema_mysql() {
} }
update_zbx_config() { update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}" test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
export ZBX_DB_PORT="${DB_SERVER_PORT}" test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
if [ -n "${DB_SERVER_SOCKET}" ]; then test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}" export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

19
Dockerfiles/server-mysql/rhel/docker-entrypoint.sh
View File

@@ -159,9 +159,12 @@ file_process_from_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables_mysql() { 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_HOST:="mysql-server"}
: ${DB_SERVER_PORT:="3306"} : ${DB_SERVER_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi fi
USE_DB_ROOT_USER=false USE_DB_ROOT_USER=false
@@ -199,11 +202,6 @@ check_variables_mysql() {
DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix"} 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() { db_tls_params() {
@@ -359,11 +357,10 @@ create_db_schema_mysql() {
} }
update_zbx_config() { update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}" test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
export ZBX_DB_PORT="${DB_SERVER_PORT}" test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
if [ -n "${DB_SERVER_SOCKET}" ]; then test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}" export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

2
Dockerfiles/server-mysql/ubuntu/Dockerfile
View File

@@ -122,7 +122,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \
EXPOSE 10051/TCP EXPOSE 10051/TCP
WORKDIR ${ZABBIX_USER_HOME_DIR} WORKDIR ${ZABBIX_USER_HOME_DIR}
VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps", "${ZABBIX_USER_HOME_DIR}/export"] VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps", "${ZABBIX_USER_HOME_DIR}/export"]
COPY ["docker-entrypoint.sh", "/usr/bin/"] COPY ["docker-entrypoint.sh", "/usr/bin/"]

19
Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh
View File

@@ -159,9 +159,12 @@ file_process_from_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables_mysql() { 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_HOST:="mysql-server"}
: ${DB_SERVER_PORT:="3306"} : ${DB_SERVER_PORT:="3306"}
mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
fi fi
USE_DB_ROOT_USER=false USE_DB_ROOT_USER=false
@@ -199,11 +202,6 @@ check_variables_mysql() {
DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix"} 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() { db_tls_params() {
@@ -359,11 +357,10 @@ create_db_schema_mysql() {
} }
update_zbx_config() { update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}" test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
export ZBX_DB_PORT="${DB_SERVER_PORT}" test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
if [ -n "${DB_SERVER_SOCKET}" ]; then test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}" export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

3
Dockerfiles/web-apache-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}

20
Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh
View File

@@ -68,12 +68,14 @@ file_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables() { check_variables() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then if [ -n "${DB_SERVER_SOCKET}" ]; then
: ${DB_SERVER_HOST:="mysql-server"} mysql_connect_args="-S ${DB_SERVER_SOCKET}"
else
DB_SERVER_HOST="localhost" 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 fi
: ${DB_SERVER_PORT:="3306"}
file_env MYSQL_USER file_env MYSQL_USER
file_env MYSQL_PASSWORD file_env MYSQL_PASSWORD
@@ -83,11 +85,6 @@ check_variables() {
DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix"} 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() { db_tls_params() {
@@ -216,8 +213,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-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 ; 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}

20
Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh
View File

@@ -68,12 +68,14 @@ file_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables() { check_variables() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then if [ -n "${DB_SERVER_SOCKET}" ]; then
: ${DB_SERVER_HOST:="mysql-server"} mysql_connect_args="-S ${DB_SERVER_SOCKET}"
else
DB_SERVER_HOST="localhost" 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 fi
: ${DB_SERVER_PORT:="3306"}
file_env MYSQL_USER file_env MYSQL_USER
file_env MYSQL_PASSWORD file_env MYSQL_PASSWORD
@@ -83,11 +85,6 @@ check_variables() {
DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix"} 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() { db_tls_params() {
@@ -216,8 +213,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-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 ; 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}

20
Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh
View File

@@ -68,12 +68,14 @@ file_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables() { check_variables() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then if [ -n "${DB_SERVER_SOCKET}" ]; then
: ${DB_SERVER_HOST:="mysql-server"} mysql_connect_args="-S ${DB_SERVER_SOCKET}"
else
DB_SERVER_HOST="localhost" 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 fi
: ${DB_SERVER_PORT:="3306"}
file_env MYSQL_USER file_env MYSQL_USER
file_env MYSQL_PASSWORD file_env MYSQL_PASSWORD
@@ -83,11 +85,6 @@ check_variables() {
DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix"} 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() { db_tls_params() {
@@ -216,8 +213,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-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 ; 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}

20
Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh
View File

@@ -68,12 +68,14 @@ file_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables() { check_variables() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then if [ -n "${DB_SERVER_SOCKET}" ]; then
: ${DB_SERVER_HOST:="mysql-server"} mysql_connect_args="-S ${DB_SERVER_SOCKET}"
else
DB_SERVER_HOST="localhost" 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 fi
: ${DB_SERVER_PORT:="3306"}
file_env MYSQL_USER file_env MYSQL_USER
file_env MYSQL_PASSWORD file_env MYSQL_PASSWORD
@@ -83,11 +85,6 @@ check_variables() {
DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix"} 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() { db_tls_params() {
@@ -216,8 +213,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}

2
Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh
View File

@@ -24,7 +24,7 @@ fi
# DefaultRuntimeDir configuration option value # DefaultRuntimeDir configuration option value
export APACHE_RUN_DIR="/tmp/apache2" export APACHE_RUN_DIR="/tmp/apache2"
# Default directories # Default directories
# Apache main configuration file # Apache main configuration file
HTTPD_CONF_FILE="/etc/apache2/httpd.conf" HTTPD_CONF_FILE="/etc/apache2/httpd.conf"

2
Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh
View File

@@ -24,7 +24,7 @@ fi
# DefaultRuntimeDir configuration option value # DefaultRuntimeDir configuration option value
export APACHE_RUN_DIR="/tmp/httpd" export APACHE_RUN_DIR="/tmp/httpd"
# Default directories # Default directories
# Apache main configuration file # Apache main configuration file
HTTPD_CONF_FILE="/etc/httpd/conf/httpd.conf" HTTPD_CONF_FILE="/etc/httpd/conf/httpd.conf"

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}

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

@@ -65,12 +65,14 @@ file_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables() { check_variables() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then if [ -n "${DB_SERVER_SOCKET}" ]; then
: ${DB_SERVER_HOST:="mysql-server"} mysql_connect_args="-S ${DB_SERVER_SOCKET}"
else
DB_SERVER_HOST="localhost" 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 fi
: ${DB_SERVER_PORT:="3306"}
file_env MYSQL_USER file_env MYSQL_USER
file_env MYSQL_PASSWORD file_env MYSQL_PASSWORD
@@ -80,11 +82,6 @@ check_variables() {
DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix"} 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() { db_tls_params() {
@@ -242,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}

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

@@ -65,12 +65,14 @@ file_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables() { check_variables() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then if [ -n "${DB_SERVER_SOCKET}" ]; then
: ${DB_SERVER_HOST:="mysql-server"} mysql_connect_args="-S ${DB_SERVER_SOCKET}"
else
DB_SERVER_HOST="localhost" 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 fi
: ${DB_SERVER_PORT:="3306"}
file_env MYSQL_USER file_env MYSQL_USER
file_env MYSQL_PASSWORD file_env MYSQL_PASSWORD
@@ -80,11 +82,6 @@ check_variables() {
DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix"} 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() { db_tls_params() {
@@ -242,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}

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

@@ -65,12 +65,14 @@ file_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables() { check_variables() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then if [ -n "${DB_SERVER_SOCKET}" ]; then
: ${DB_SERVER_HOST:="mysql-server"} mysql_connect_args="-S ${DB_SERVER_SOCKET}"
else
DB_SERVER_HOST="localhost" 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 fi
: ${DB_SERVER_PORT:="3306"}
file_env MYSQL_USER file_env MYSQL_USER
file_env MYSQL_PASSWORD file_env MYSQL_PASSWORD
@@ -80,11 +82,6 @@ check_variables() {
DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix"} 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() { db_tls_params() {
@@ -242,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}

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

@@ -65,12 +65,14 @@ file_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables() { check_variables() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then if [ -n "${DB_SERVER_SOCKET}" ]; then
: ${DB_SERVER_HOST:="mysql-server"} mysql_connect_args="-S ${DB_SERVER_SOCKET}"
else
DB_SERVER_HOST="localhost" 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 fi
: ${DB_SERVER_PORT:="3306"}
file_env MYSQL_USER file_env MYSQL_USER
file_env MYSQL_PASSWORD file_env MYSQL_PASSWORD
@@ -80,11 +82,6 @@ check_variables() {
DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix"} 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() { db_tls_params() {
@@ -242,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}

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

@@ -65,12 +65,14 @@ file_env() {
# Check prerequisites for MySQL database # Check prerequisites for MySQL database
check_variables() { check_variables() {
if [ ! -n "${DB_SERVER_SOCKET}" ]; then if [ -n "${DB_SERVER_SOCKET}" ]; then
: ${DB_SERVER_HOST:="mysql-server"} mysql_connect_args="-S ${DB_SERVER_SOCKET}"
else
DB_SERVER_HOST="localhost" 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 fi
: ${DB_SERVER_PORT:="3306"}
file_env MYSQL_USER file_env MYSQL_USER
file_env MYSQL_PASSWORD file_env MYSQL_PASSWORD
@@ -80,11 +82,6 @@ check_variables() {
DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix"} 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() { db_tls_params() {
@@ -242,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}