Change variable name

Use the original socket for l3drun
Set back the /etc/group approach

run/scripts/start

@@ -45,16 +45,16 @@ function startContainer {
         --env COMPOSER_DOWNGRADE=${COMPOSER_DOWNGRADE}
         --env PHP_VERSION=${PHP_VERSION}
         --env SSH_AUTH_SOCK=${SSHAUTHSOCK}
-        --volume ${DOCKERSOCKHOST}:/var/run/docker.sock
+        --volume ${L3DDOCKERHOST}:/var/run/docker.sock
         --volume ${WORKDIR}:/drupal
         --volume ${SSHAUTH}:${SSHAUTHSOCK}
         --volume ${HOMEDIR}:/home/${USERNAME}
-        --volume /etc/group:/etc/group:ro
         --workdir /drupal
         --restart unless-stopped
       )
       if [[ ${L3DHOSTOS} != Darwin ]]; then
         start_params+=(
+          --volume /etc/group:/etc/group:ro
           --volume /etc/passwd:/etc/passwd:ro
           --volume /etc/shadow:/etc/shadow:ro
           --volume /etc/sudoers:/etc/sudoers:ro

setup/scripts/l3d

@@ -3,11 +3,11 @@
 GROUPID=$(id -g)
 GROUPIDS=$(id -G)
 L3DHOSTOS="$(uname -s)"
+L3DDOCKERHOST=/var/run/docker.sock
 SSHAUTH=${SSH_AUTH_SOCK}
 SSHAUTHSOCK=/ssh-agent
 USERID=$(id -u)
 USERNAME=${USER}
-DOCKERSOCKHOST=/var/run/docker.sock
 
 case "${L3DHOSTOS}" in
     Darwin*)
@@ -17,7 +17,7 @@ case "${L3DHOSTOS}" in
       else
         # This works on MacOS when coreutils is installed.
         SCRIPTPATH="$(dirname "$(greadlink -f "$0")")"
-        DOCKERSOCKHOST="$(dirname "$(greadlink -f "/var/run/docker.sock")")/docker.sock"
+        L3DDOCKERHOST="$(dirname "$(greadlink -f "/var/run/docker.sock")")/docker.sock"
       fi
       # Write a fake passwd file which will later be mounted into containers.
       echo "${USERNAME}:x:${USERID}:${GROUPID}:${USERNAME},,,:/home/${USERNAME}:${L3DSHELL}" >${HOME}/.passwd
@@ -49,8 +49,8 @@ if [[ ! -n ${ID} ]]; then
   l3drun_params=(
     --env L3DHOSTOS=${L3DHOSTOS}
     --env SCRIPTPATH=${SCRIPTPATH}
-    --env DOCKERSOCKHOST=${DOCKERSOCKHOST}
-    --volume ${DOCKERSOCKHOST}:/var/run/docker.sock
+    --env L3DDOCKERHOST=${L3DDOCKERHOST}
+    --volume /var/run/docker.sock:/var/run/docker.sock
     --volume ${SCRIPTPATH}:/setup
     --volume ${HOME}/.traefik:/root/.traefik
   )