map host docker group id to containers

util/Setup/Dockerfile

@@ -9,8 +9,6 @@ RUN apt-get update \
 WORKDIR /app
 COPY obj/Docker/publish .
 COPY entrypoint.sh /
-
-RUN groupadd -g 999 bitwarden \
-    && chmod +x /entrypoint.sh
+RUN chmod +x /entrypoint.sh
 
 ENTRYPOINT ["/entrypoint.sh"]

util/Setup/entrypoint.sh

@@ -1,35 +1,67 @@
 #!/bin/bash
 
+# Setup
+
+GROUPNAME="bitwarden"
 USERNAME="bitwarden"
-NOUSER=`id -u $USERNAME > /dev/null 2>&1; echo $?`
+
+CURRENTGID=`getent group $GROUPNAME | cut -d: -f3`
+LGID=${LOCAL_GID:-999}
+
+CURRENTUID=`id -u $USERNAME`
+NOUSER=`$CURRENTUID > /dev/null 2>&1; echo $?`
 LUID=${LOCAL_UID:-999}
 
 # Step down from host root
+
+if [ $LGID == 0 ]
+then
+    LGID=999
+fi
+
 if [ $LUID == 0 ]
 then
     LUID=999
 fi
 
-if [ $NOUSER == 0 ] && [ `id -u $USERNAME` != $LUID ]
+# Create group
+
+if [ $CURRENTGID ]
+then
+    if [ $CURRENTGID != $LGID ]
+    then
+        groupmod -g $LGID $GROUPNAME
+    fi
+else
+    groupadd -g $LGID $GROUPNAME
+fi
+
+# Create user and assign group
+
+if [ $NOUSER == 0 ] && [ $CURRENTUID != $LUID ]
 then
     usermod -u $LUID $USERNAME
 elif [ $NOUSER == 1 ]
 then
-    useradd -r -u $LUID -g $USERNAME $USERNAME
+    useradd -r -u $LUID -g $GROUPNAME $USERNAME
 fi
 
+# Make home directory for user
+
 if [ ! -d "/home/$USERNAME" ]
 then
     mkhomedir_helper $USERNAME
 fi
 
-chown -R $USERNAME:$USERNAME /app
+# The rest...
+
+chown -R $USERNAME:$GROUPNAME /app
 mkdir -p /bitwarden/env
 mkdir -p /bitwarden/docker
 mkdir -p /bitwarden/ssl
 mkdir -p /bitwarden/letsencrypt
 mkdir -p /bitwarden/identity
 mkdir -p /bitwarden/nginx
-chown -R $USERNAME:$USERNAME /bitwarden
+chown -R $USERNAME:$GROUPNAME /bitwarden
 
-exec gosu $USERNAME:$USERNAME "$@"
+exec gosu $USERNAME:$GROUPNAME "$@"