From 343cce920b83bbd46a6b5b756724f07aeeded31c Mon Sep 17 00:00:00 2001 From: Michael Schilonka Date: Fri, 28 Oct 2022 16:45:11 +0200 Subject: [PATCH 1/2] chore(cli): check if userid or groupid exist in alpine before creating --- getdeck/sources/tooler.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/getdeck/sources/tooler.py b/getdeck/sources/tooler.py index 3554317..20905b0 100644 --- a/getdeck/sources/tooler.py +++ b/getdeck/sources/tooler.py @@ -86,7 +86,8 @@ def build_user_container(config: ClientConfiguration): if sys.platform in ["darwin", "win32"]: user_group_add = "RUN addgroup -S tooler && adduser -S tooler -G tooler" else: - user_group_add = "RUN addgroup -g ${GROUP_ID} -S tooler && adduser -u ${USER_ID} -S tooler -G tooler" + 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" Dockerfile = io.BytesIO( ( From 627f82581105a48638fab4814e83ae5790a4bb93 Mon Sep 17 00:00:00 2001 From: Michael Schilonka Date: Fri, 28 Oct 2022 16:46:52 +0200 Subject: [PATCH 2/2] fix: black code styling --- getdeck/sources/tooler.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/getdeck/sources/tooler.py b/getdeck/sources/tooler.py index 20905b0..be4b566 100644 --- a/getdeck/sources/tooler.py +++ b/getdeck/sources/tooler.py @@ -86,8 +86,10 @@ def build_user_container(config: ClientConfiguration): if sys.platform in ["darwin", "win32"]: 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" + 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" + ) Dockerfile = io.BytesIO( (