From 9bae40a3a53face59fa6947c147d2aff9cedf7de Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Tue, 11 Nov 2025 16:58:37 +0900
Subject: [PATCH] Fixed custom snmptrapd configuration file

---
 Dockerfiles/snmptraps/alpine/Dockerfile               |  5 +++--
 .../alpine/conf/usr/sbin/snmptrapd_runner.sh          | 11 +++++++++++
 Dockerfiles/snmptraps/centos/Dockerfile               |  5 +++--
 .../centos/conf/usr/sbin/snmptrapd_runner.sh          | 11 +++++++++++
 Dockerfiles/snmptraps/ol/Dockerfile                   |  5 +++--
 .../snmptraps/ol/conf/usr/sbin/snmptrapd_runner.sh    | 11 +++++++++++
 Dockerfiles/snmptraps/rhel/Dockerfile                 |  5 +++--
 .../snmptraps/rhel/conf/usr/sbin/snmptrapd_runner.sh  | 11 +++++++++++
 Dockerfiles/snmptraps/ubuntu/Dockerfile               |  5 +++--
 .../ubuntu/conf/usr/sbin/snmptrapd_runner.sh          | 11 +++++++++++
 10 files changed, 70 insertions(+), 10 deletions(-)
 create mode 100755 Dockerfiles/snmptraps/alpine/conf/usr/sbin/snmptrapd_runner.sh
 create mode 100755 Dockerfiles/snmptraps/centos/conf/usr/sbin/snmptrapd_runner.sh
 create mode 100755 Dockerfiles/snmptraps/ol/conf/usr/sbin/snmptrapd_runner.sh
 create mode 100755 Dockerfiles/snmptraps/rhel/conf/usr/sbin/snmptrapd_runner.sh
 create mode 100755 Dockerfiles/snmptraps/ubuntu/conf/usr/sbin/snmptrapd_runner.sh

diff --git a/Dockerfiles/snmptraps/alpine/Dockerfile b/Dockerfiles/snmptraps/alpine/Dockerfile
index 94ec8dc7c..db28334da 100644
--- a/Dockerfiles/snmptraps/alpine/Dockerfile
+++ b/Dockerfiles/snmptraps/alpine/Dockerfile
@@ -55,7 +55,7 @@ RUN set -eux && \
     chgrp -R 0 /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/ && \
     chmod -R g=u /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/
 
-EXPOSE 1162/UDP
+EXPOSE 1162/udp
 
 WORKDIR ${ZABBIX_USER_HOME_DIR}/snmptraps/
 
@@ -64,7 +64,8 @@ VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps", "${SNMP_PERSISTENT_DIR}"]
 COPY ["conf/etc/logrotate.d/zabbix_snmptraps", "/etc/logrotate.d/"]
 COPY ["conf/etc/snmp/snmptrapd.conf", "/etc/snmp/"]
 COPY ["conf/usr/sbin/zabbix_trap_handler.sh", "/usr/sbin/"]
+COPY ["conf/usr/sbin/snmptrapd_runner.sh", "/usr/sbin/"]
 
 USER 1997
 
-CMD ["/usr/sbin/snmptrapd", "-n", "-t", "-X", "-C", "-c", "/etc/snmp/snmptrapd.conf", "-Lo", "-A", "--doNotFork=yes"]
+CMD ["/usr/sbin/snmptrapd_runner.sh"]
diff --git a/Dockerfiles/snmptraps/alpine/conf/usr/sbin/snmptrapd_runner.sh b/Dockerfiles/snmptraps/alpine/conf/usr/sbin/snmptrapd_runner.sh
new file mode 100755
index 000000000..1ce383061
--- /dev/null
+++ b/Dockerfiles/snmptraps/alpine/conf/usr/sbin/snmptrapd_runner.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+DEFAULT_ARGS="-n -t -X -Lo -A"
+
+CONF_FILE_LIST="/etc/snmp/snmptrapd.conf,$SNMP_PERSISTENT_DIR/snmptrapd.conf"
+
+if [ -f "$SNMP_PERSISTENT_DIR/snmptrapd_custom.conf" ]; then
+    CONF_FILE_LIST="$CONF_FILE_LIST,$SNMP_PERSISTENT_DIR/snmptrapd_custom.conf"
+fi
+
+/usr/sbin/snmptrapd --doNotFork=yes -C -c "$CONF_FILE_LIST" $DEFAULT_ARGS
diff --git a/Dockerfiles/snmptraps/centos/Dockerfile b/Dockerfiles/snmptraps/centos/Dockerfile
index 5ad53ae12..0d4971870 100644
--- a/Dockerfiles/snmptraps/centos/Dockerfile
+++ b/Dockerfiles/snmptraps/centos/Dockerfile
@@ -61,7 +61,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     chgrp -R 0 /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/ && \
     chmod -R g=u /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/
 
-EXPOSE 1162/UDP
+EXPOSE 1162/udp
 
 WORKDIR ${ZABBIX_USER_HOME_DIR}/snmptraps/
 
@@ -70,7 +70,8 @@ VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps", "${SNMP_PERSISTENT_DIR}"]
 COPY ["conf/etc/logrotate.d/zabbix_snmptraps", "/etc/logrotate.d/"]
 COPY ["conf/etc/snmp/snmptrapd.conf", "/etc/snmp/"]
 COPY ["conf/usr/sbin/zabbix_trap_handler.sh", "/usr/sbin/"]
+COPY ["conf/usr/sbin/snmptrapd_runner.sh", "/usr/sbin/"]
 
 USER 1997
 
-CMD ["/usr/sbin/snmptrapd", "-n", "-t", "-X", "-C", "-c", "/etc/snmp/snmptrapd.conf", "-Lo", "-A", "--doNotFork=yes"]
+CMD ["/usr/sbin/snmptrapd_runner.sh"]
diff --git a/Dockerfiles/snmptraps/centos/conf/usr/sbin/snmptrapd_runner.sh b/Dockerfiles/snmptraps/centos/conf/usr/sbin/snmptrapd_runner.sh
new file mode 100755
index 000000000..1ce383061
--- /dev/null
+++ b/Dockerfiles/snmptraps/centos/conf/usr/sbin/snmptrapd_runner.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+DEFAULT_ARGS="-n -t -X -Lo -A"
+
+CONF_FILE_LIST="/etc/snmp/snmptrapd.conf,$SNMP_PERSISTENT_DIR/snmptrapd.conf"
+
+if [ -f "$SNMP_PERSISTENT_DIR/snmptrapd_custom.conf" ]; then
+    CONF_FILE_LIST="$CONF_FILE_LIST,$SNMP_PERSISTENT_DIR/snmptrapd_custom.conf"
+fi
+
+/usr/sbin/snmptrapd --doNotFork=yes -C -c "$CONF_FILE_LIST" $DEFAULT_ARGS
diff --git a/Dockerfiles/snmptraps/ol/Dockerfile b/Dockerfiles/snmptraps/ol/Dockerfile
index db7b16cda..ef9a532c0 100644
--- a/Dockerfiles/snmptraps/ol/Dockerfile
+++ b/Dockerfiles/snmptraps/ol/Dockerfile
@@ -60,7 +60,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     chgrp -R 0 /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/ && \
     chmod -R g=u /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/
 
-EXPOSE 1162/UDP
+EXPOSE 1162/udp
 
 WORKDIR ${ZABBIX_USER_HOME_DIR}/snmptraps/
 
@@ -69,7 +69,8 @@ VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps", "${SNMP_PERSISTENT_DIR}"]
 COPY ["conf/etc/logrotate.d/zabbix_snmptraps", "/etc/logrotate.d/"]
 COPY ["conf/etc/snmp/snmptrapd.conf", "/etc/snmp/"]
 COPY ["conf/usr/sbin/zabbix_trap_handler.sh", "/usr/sbin/"]
+COPY ["conf/usr/sbin/snmptrapd_runner.sh", "/usr/sbin/"]
 
 USER 1997
 
-CMD ["/usr/sbin/snmptrapd", "-n", "-t", "-X", "-C", "-c", "/etc/snmp/snmptrapd.conf", "-Lo", "-A", "--doNotFork=yes"]
+CMD ["/usr/sbin/snmptrapd_runner.sh"]
diff --git a/Dockerfiles/snmptraps/ol/conf/usr/sbin/snmptrapd_runner.sh b/Dockerfiles/snmptraps/ol/conf/usr/sbin/snmptrapd_runner.sh
new file mode 100755
index 000000000..1ce383061
--- /dev/null
+++ b/Dockerfiles/snmptraps/ol/conf/usr/sbin/snmptrapd_runner.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+DEFAULT_ARGS="-n -t -X -Lo -A"
+
+CONF_FILE_LIST="/etc/snmp/snmptrapd.conf,$SNMP_PERSISTENT_DIR/snmptrapd.conf"
+
+if [ -f "$SNMP_PERSISTENT_DIR/snmptrapd_custom.conf" ]; then
+    CONF_FILE_LIST="$CONF_FILE_LIST,$SNMP_PERSISTENT_DIR/snmptrapd_custom.conf"
+fi
+
+/usr/sbin/snmptrapd --doNotFork=yes -C -c "$CONF_FILE_LIST" $DEFAULT_ARGS
diff --git a/Dockerfiles/snmptraps/rhel/Dockerfile b/Dockerfiles/snmptraps/rhel/Dockerfile
index ae7ab1abb..9e0fae4e9 100644
--- a/Dockerfiles/snmptraps/rhel/Dockerfile
+++ b/Dockerfiles/snmptraps/rhel/Dockerfile
@@ -100,7 +100,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     chgrp -R 0 /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/ && \
     chmod -R g=u /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/
 
-EXPOSE 1162/UDP
+EXPOSE 1162/udp
 
 WORKDIR ${ZABBIX_USER_HOME_DIR}/snmptraps/
 
@@ -109,7 +109,8 @@ VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps", "${SNMP_PERSISTENT_DIR}"]
 COPY ["conf/etc/logrotate.d/zabbix_snmptraps", "/etc/logrotate.d/"]
 COPY ["conf/etc/snmp/snmptrapd.conf", "/etc/snmp/"]
 COPY ["conf/usr/sbin/zabbix_trap_handler.sh", "/usr/sbin/"]
+COPY ["conf/usr/sbin/snmptrapd_runner.sh", "/usr/sbin/"]
 
 USER 1997
 
-CMD ["/usr/sbin/snmptrapd", "-n", "-t", "-X", "-C", "-c", "/etc/snmp/snmptrapd.conf", "-Lo", "-A", "--doNotFork=yes"]
+CMD ["/usr/sbin/snmptrapd_runner.sh"]
diff --git a/Dockerfiles/snmptraps/rhel/conf/usr/sbin/snmptrapd_runner.sh b/Dockerfiles/snmptraps/rhel/conf/usr/sbin/snmptrapd_runner.sh
new file mode 100755
index 000000000..1ce383061
--- /dev/null
+++ b/Dockerfiles/snmptraps/rhel/conf/usr/sbin/snmptrapd_runner.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+DEFAULT_ARGS="-n -t -X -Lo -A"
+
+CONF_FILE_LIST="/etc/snmp/snmptrapd.conf,$SNMP_PERSISTENT_DIR/snmptrapd.conf"
+
+if [ -f "$SNMP_PERSISTENT_DIR/snmptrapd_custom.conf" ]; then
+    CONF_FILE_LIST="$CONF_FILE_LIST,$SNMP_PERSISTENT_DIR/snmptrapd_custom.conf"
+fi
+
+/usr/sbin/snmptrapd --doNotFork=yes -C -c "$CONF_FILE_LIST" $DEFAULT_ARGS
diff --git a/Dockerfiles/snmptraps/ubuntu/Dockerfile b/Dockerfiles/snmptraps/ubuntu/Dockerfile
index 380ef8456..f94b84f9c 100644
--- a/Dockerfiles/snmptraps/ubuntu/Dockerfile
+++ b/Dockerfiles/snmptraps/ubuntu/Dockerfile
@@ -59,7 +59,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \
     chgrp -R 0 /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/ && \
     chmod -R g=u /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/
 
-EXPOSE 1162/UDP
+EXPOSE 1162/udp
 
 WORKDIR ${ZABBIX_USER_HOME_DIR}/snmptraps/
 
@@ -68,7 +68,8 @@ VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps", "${SNMP_PERSISTENT_DIR}"]
 COPY ["conf/etc/logrotate.d/zabbix_snmptraps", "/etc/logrotate.d/"]
 COPY ["conf/etc/snmp/snmptrapd.conf", "/etc/snmp/"]
 COPY ["conf/usr/sbin/zabbix_trap_handler.sh", "/usr/sbin/"]
+COPY ["conf/usr/sbin/snmptrapd_runner.sh", "/usr/sbin/"]
 
 USER 1997
 
-CMD ["/usr/sbin/snmptrapd", "-n", "-t", "-X", "-C", "-c", "/etc/snmp/snmptrapd.conf", "-Lo", "-A", "--doNotFork=yes"]
+CMD ["/usr/sbin/snmptrapd_runner.sh"]
diff --git a/Dockerfiles/snmptraps/ubuntu/conf/usr/sbin/snmptrapd_runner.sh b/Dockerfiles/snmptraps/ubuntu/conf/usr/sbin/snmptrapd_runner.sh
new file mode 100755
index 000000000..1ce383061
--- /dev/null
+++ b/Dockerfiles/snmptraps/ubuntu/conf/usr/sbin/snmptrapd_runner.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+DEFAULT_ARGS="-n -t -X -Lo -A"
+
+CONF_FILE_LIST="/etc/snmp/snmptrapd.conf,$SNMP_PERSISTENT_DIR/snmptrapd.conf"
+
+if [ -f "$SNMP_PERSISTENT_DIR/snmptrapd_custom.conf" ]; then
+    CONF_FILE_LIST="$CONF_FILE_LIST,$SNMP_PERSISTENT_DIR/snmptrapd_custom.conf"
+fi
+
+/usr/sbin/snmptrapd --doNotFork=yes -C -c "$CONF_FILE_LIST" $DEFAULT_ARGS