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

Merge pull request #1690 from zabbix/fix/DEVOPS-46/empty-db-socket

Browse Source 
fix: env ZBX_DB_SOCKET being set to an empty value
This commit is contained in:
Alexey Pustovalov
2025-05-08 17:43:47 +09:00
committed by GitHub
parent 750cce1334 13301349ae
commit 200d49489d
10 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -351,8 +351,9 @@ create_db_schema_mysql() {
update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}"
export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
if [ -n "${DB_SERVER_SOCKET}" ]; then
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

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

@@ -348,8 +348,9 @@ create_db_schema_mysql() {
update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}"
export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
if [ -n "${DB_SERVER_SOCKET}" ]; then
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

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

@@ -348,8 +348,9 @@ create_db_schema_mysql() {
update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}"
export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
if [ -n "${DB_SERVER_SOCKET}" ]; then
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

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

@@ -348,8 +348,9 @@ create_db_schema_mysql() {
update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}"
export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
if [ -n "${DB_SERVER_SOCKET}" ]; then
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

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

@@ -348,8 +348,9 @@ create_db_schema_mysql() {
update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}"
export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
if [ -n "${DB_SERVER_SOCKET}" ]; then
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

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

@@ -364,8 +364,9 @@ create_db_schema_mysql() {
update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}"
export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
if [ -n "${DB_SERVER_SOCKET}" ]; then
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

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

@@ -361,8 +361,9 @@ create_db_schema_mysql() {
update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}"
export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
if [ -n "${DB_SERVER_SOCKET}" ]; then
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

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

@@ -361,8 +361,9 @@ create_db_schema_mysql() {
update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}"
export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
if [ -n "${DB_SERVER_SOCKET}" ]; then
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

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

@@ -361,8 +361,9 @@ create_db_schema_mysql() {
update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}"
export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
if [ -n "${DB_SERVER_SOCKET}" ]; then
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

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

@@ -361,8 +361,9 @@ create_db_schema_mysql() {
update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}"
export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
if [ -n "${DB_SERVER_SOCKET}" ]; then
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then