From fe7c1440fdc88ba7c4c61d6eb6fe9972b3a8a38d Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Sat, 19 Dec 2020 12:25:51 -0500
Subject: [PATCH] Review zabbix user and group configuration

---
 agent2/alpine/Dockerfile | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/agent2/alpine/Dockerfile b/agent2/alpine/Dockerfile
index 4246a0d07..9c3e5ad2b 100644
--- a/agent2/alpine/Dockerfile
+++ b/agent2/alpine/Dockerfile
@@ -10,12 +10,16 @@ LABEL org.opencontainers.image.title="Zabbix agent 2" \
 STOPSIGNAL SIGTERM
 
 RUN set -eux && \
-    addgroup -S -g 1995 zabbix && \
-    adduser -S \
-            -D -G zabbix -G root \
-            -u 1997 \
-            -h /var/lib/zabbix/ \
+    addgroup --system --gid 1995 zabbix && \
+    adduser --system \
+            --gecos "Zabbix monitoring system" \
+            --disabled-password \
+            --uid 1997 \
+            --ingroup zabbix \
+            --shell /sbin/nologin \
+            --home /var/lib/zabbix/ \
         zabbix && \
+    adduser zabbix root && \
     mkdir -p /etc/zabbix && \
     mkdir -p /etc/zabbix/zabbix_agentd.d && \
     mkdir -p /var/lib/zabbix && \