Skip to content

Commit 3cb0f0e

Browse files
authored
fix: Ensure gid set correctly in Telegraf images (#719)
2 parents e781a6e + 2296f40 commit 3cb0f0e

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

telegraf/1.27/entrypoint.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@ else
1111
# Allow telegraf to send ICMP packets and bind to privliged ports
1212
setcap cap_net_raw,cap_net_bind_service+ep /usr/bin/telegraf || echo "Failed to set additional capabilities on /usr/bin/telegraf"
1313

14-
exec setpriv --reuid telegraf --init-groups "$@"
14+
export HOME=$(getent passwd telegraf | cut -d : -f 6)
15+
exec setpriv --reuid telegraf --regid telegraf --groups telegraf "$@"
1516
fi

telegraf/1.28/entrypoint.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@ else
1111
# Allow telegraf to send ICMP packets and bind to privliged ports
1212
setcap cap_net_raw,cap_net_bind_service+ep /usr/bin/telegraf || echo "Failed to set additional capabilities on /usr/bin/telegraf"
1313

14-
exec setpriv --reuid telegraf --init-groups "$@"
14+
export HOME=$(getent passwd telegraf | cut -d : -f 6)
15+
exec setpriv --reuid telegraf --regid telegraf --groups telegraf "$@"
1516
fi

telegraf/1.29/entrypoint.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@ else
1111
# Allow telegraf to send ICMP packets and bind to privliged ports
1212
setcap cap_net_raw,cap_net_bind_service+ep /usr/bin/telegraf || echo "Failed to set additional capabilities on /usr/bin/telegraf"
1313

14-
exec setpriv --reuid telegraf --init-groups "$@"
14+
export HOME=$(getent passwd telegraf | cut -d : -f 6)
15+
exec setpriv --reuid telegraf --regid telegraf --groups telegraf "$@"
1516
fi

telegraf/nightly/entrypoint.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@ else
1111
# Allow telegraf to send ICMP packets and bind to privliged ports
1212
setcap cap_net_raw,cap_net_bind_service+ep /usr/bin/telegraf || echo "Failed to set additional capabilities on /usr/bin/telegraf"
1313

14-
exec setpriv --reuid telegraf --init-groups "$@"
14+
export HOME=$(getent passwd telegraf | cut -d : -f 6)
15+
exec setpriv --reuid telegraf --regid telegraf --groups telegraf "$@"
1516
fi

0 commit comments

Comments
 (0)