From b40ec2de7a02f3f4550aa06b44191d93f01c56d5 Mon Sep 17 00:00:00 2001
From: Chris Harding <sjrct@users.noreply.github.com>
Date: Wed, 29 May 2024 12:25:54 -0400
Subject: [PATCH] Dockerfile: Add group by id not name

When a group already exists with the specified gid, usermod with -f will
silently added the group with a default new gid. So worker ends up with
an extra useless group rather than the one specified.

Signed-off-by: Chris Harding <sjrct@users.noreply.github.com>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index d646a3d..a147ab6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -56,7 +56,7 @@ RUN ldconfig
 # add user (+ group workaround for ArchLinux)
 RUN useradd -m worker --uid ${uid} -G cdrom \
     && if [ -n "${optical_gid}" ]; then groupadd -f -g "${optical_gid}" optical \
-    && usermod -a -G optical worker; fi \
+    && usermod -a -G "${optical_gid}" worker; fi \
     && mkdir -p /output /home/worker/.config/whipper \
     && chown worker: /output /home/worker/.config/whipper
 VOLUME ["/home/worker/.config/whipper", "/output"]