From 90131929b5c1586efd5f190575e69638fc69c9aa Mon Sep 17 00:00:00 2001
From: Joao P Dubas <joao.dubas+gitea@gmail.com>
Date: Sun, 31 Mar 2024 20:53:45 +0000
Subject: [PATCH] fix: create extra groups before system setup

This avoids conflict with system groups.
---
 Dockerfile | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e5a3e61..cedce6f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,18 @@
 FROM ubuntu:mantic-20240216
 
-# system deps
+# user setup
 ARG USER_UID=1000
 ARG USER_GID=1000
 ARG DOCKER_GID=999
 ARG WHEEL_GID=980
+RUN echo 'remove existing ubuntu user' \
+  && groupdel --force ubuntu \
+  && userdel --force ubuntu \
+  && echo 'setup extra groups' \
+  && groupadd --gid ${WHEEL_GID} wheel \
+  && groupadd --gid ${DOCKER_GID} docker
+
+# system deps
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update \
   && apt-get install -y software-properties-common \
@@ -83,15 +91,7 @@ RUN apt-get update \
     zlib1g-dev \
   && rm -rf /var/lib/apt/lists/* \
   && locale-gen en_US.UTF-8 \
-  && echo 'remove existing ubuntu user' \
-  && groupdel --force ubuntu \
-  && userdel --force ubuntu \
-  && echo 'update gid from systemd-journal group' \
-  && groupmod -g 994 systemd-journal \
-  && chgrp --recursive systemd-journal /var/log/journal \
   && echo 'setup unprivileged user' \
-  && groupadd --gid ${WHEEL_GID} wheel \
-  && groupadd --gid ${DOCKER_GID} docker \
   && groupadd --gid ${USER_GID} coder \
   && useradd \
     --uid ${USER_UID} \