From 5fb3be922881f6c84e8a7bf939f2d71f1c1fb393 Mon Sep 17 00:00:00 2001
From: hygienic-books <hygienic-books@tentic.net>
Date: Fri, 14 Mar 2025 09:51:04 +0100
Subject: [PATCH] fix(zabbixserver): Zabbix server now works without override

Upstream github.com/zabbix/zabbix-docker/issues/1643 is now fixed.
This previously prevented us from using both HashiCorp Vault and the
default docker-entrypoint.sh file that came with the the
zabbix/zabbix-server-pgsql:alpine-7.2-latest image.

Upstreams commit hash 435e92f made it so that when Vault params are
present both the Zabbix server config params DBUser and DBPassword
are unset.
---
 compose.override.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/compose.override.yaml b/compose.override.yaml
index c6c11b6..4888e1d 100644
--- a/compose.override.yaml
+++ b/compose.override.yaml
@@ -68,7 +68,6 @@ services:
             - "/opt/docker-data/zabbixserver-${CONTEXT}/zabbixserver/config/cert/.ZBX_SERVER_CERT_FILE:${ZBX_TLSCERTFILE}:ro"
             - "/opt/docker-data/zabbixserver-${CONTEXT}/zabbixserver/config/cert/.ZBX_SERVER_KEY_FILE:${ZBX_TLSKEYFILE}:ro"
             - "/opt/docker-data/zabbixserver-${CONTEXT}/postgres/config/socket:/var/run/postgresql"
-            - "/opt/docker-data/zabbixserver-${CONTEXT}/zabbixserver/config/docker-entrypoint.sh:/usr/bin/docker-entrypoint.sh:ro"
         env_file: !reset []
         environment:
             POSTGRES_DB: "${POSTGRES_DB}"