From fbdc92c9a64c54b37898f0e15eb1a4718ae339bb Mon Sep 17 00:00:00 2001 From: Roland Date: Fri, 28 Oct 2022 20:15:21 +0200 Subject: [PATCH] use getent to read groups/passwd; use found group on adduser --- getdeck/sources/tooler.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/getdeck/sources/tooler.py b/getdeck/sources/tooler.py index be4b566..f3778dd 100644 --- a/getdeck/sources/tooler.py +++ b/getdeck/sources/tooler.py @@ -87,8 +87,8 @@ def build_user_container(config: ClientConfiguration): user_group_add = "RUN addgroup -S tooler && adduser -S tooler -G tooler" else: user_group_add = ( - "RUN cat /etc/group | grep ${GROUP_ID} || addgroup -g ${GROUP_ID} -S tooler && " - "cat /etc/passwd | grep ${USER_ID} || adduser -u ${USER_ID} -S tooler -G tooler" + "RUN getent group ${GROUP_ID} || addgroup -g ${GROUP_ID} -S tooler && " + "getent passwd ${USER_ID} || adduser -u ${USER_ID} -S tooler -G $(getent group ${GROUP_ID} | cut -d: -f1)" ) Dockerfile = io.BytesIO(