riotdocker-base,riotbuild: fix user group setting, add git-cache-rs

Author: crasbe

riotbuild/Dockerfile

@@ -348,6 +348,11 @@ RUN \
 # get laze binary
 COPY --from=kaspar030/laze:0.1.20-jammy /laze /usr/bin/laze
 
+# get git-cache-rs binary and set the environment variable for
+# the RIOT package subsystem
+COPY --from=ghcr.io/kaspar030/git-cache:0.2.8-jammy /git-cache /usr/bin/git-cache
+ENV GIT_CACHE_RS /usr/bin/git-cache
+
 # get Dockerfile version from build args
 ARG RIOTBUILD_VERSION=unknown
 ENV RIOTBUILD_VERSION $RIOTBUILD_VERSION

riotdocker-base/Dockerfile

@@ -20,7 +20,7 @@ RUN \
 COPY create_user.c /tmp/create_user.c
 RUN gcc -DHOMEDIR=\"/data/riotbuild\" -DUSERNAME=\"riotbuild\" /tmp/create_user.c -o /usr/local/bin/create_user \
     && chown root:root /usr/local/bin/create_user \
-    && chmod u=rws,g=x,o=- /usr/local/bin/create_user \
+    && chmod u=rws,g=x,o=x /usr/local/bin/create_user \
     && rm /tmp/create_user.c
 
 # Create working directory for mounting the RIOT sources

riotdocker-base/create_user.c

@@ -14,7 +14,13 @@ int main(int argc, char *argv[])
     unsigned uid = atoi(argv[1]);
     char buf[128];
 
-    sprintf(buf, "/usr/sbin/useradd -u %u -d %s -r -g 0 -N %s", uid, HOMEDIR, USERNAME);
+    /* create the usergroup */
+    sprintf(buf, "/usr/sbin/groupadd -g %u %s", uid, USERNAME);
     system(buf);
+
+    /* set the UID, Home Directory, User Group */
+    sprintf(buf, "/usr/sbin/useradd -u %u -d %s -g %u %s", uid, HOMEDIR, uid, USERNAME);
+    system(buf);
+
     return 0;
 }