fix user and group settings for macos

run/scripts/start

@@ -36,27 +36,52 @@ function startContainer {
     if [[ -n ${ID} ]]; then
       docker start ${COMPOSE_PROJECT_NAME}_l3d
     else
-      docker run --name ${COMPOSE_PROJECT_NAME}_l3d -dt \
-        --hostname ${COMPOSE_PROJECT_NAME}-l3d \
-        --user ${USERID}:${GROUPID} \
-        --group-add ${GROUPIDS// / --group-add } \
-        --env L3DSHELL=${L3DSHELL} \
-        --env COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME} \
-        --env COMPOSER_DOWNGRADE=${COMPOSER_DOWNGRADE} \
-        --env PHP_VERSION=${PHP_VERSION} \
-        --env SSH_AUTH_SOCK=${SSHAUTHSOCK} \
-        --volume /var/run/docker.sock:/var/run/docker.sock \
-        --volume ${WORKDIR}:/drupal \
-        --volume /etc/group:/etc/group:ro \
-        --volume /etc/passwd:/etc/passwd:ro \
-        --volume /etc/shadow:/etc/shadow:ro \
-        --volume /etc/sudoers:/etc/sudoers:ro \
-        --volume /etc/sudoers.d:/etc/sudoers.d:ro \
-        --volume ${SSHAUTH}:${SSHAUTHSOCK} \
-        --volume ${HOMEDIR}:${HOMEDIR} \
-        --workdir /drupal \
-        --restart unless-stopped \
-        registry.lakedrops.com/docker/l3d/php-${PHP_VERSION}:${VERSION}
+      case "${L3DHOSTOS}" in
+        Darwin*)
+          docker run --name ${COMPOSE_PROJECT_NAME}_l3d -dt \
+            --hostname ${COMPOSE_PROJECT_NAME}-l3d \
+            --group-add ${GROUPIDS// / --group-add } \
+            --env L3DSHELL=${L3DSHELL} \
+            --env COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME} \
+            --env COMPOSER_DOWNGRADE=${COMPOSER_DOWNGRADE} \
+            --env PHP_VERSION=${PHP_VERSION} \
+            --env SSH_AUTH_SOCK=${SSHAUTHSOCK} \
+            --volume /var/run/docker.sock:/var/run/docker.sock \
+            --volume ${WORKDIR}:/drupal \
+            --volume /etc/group:/etc/group:ro \
+            --volume /etc/passwd:/etc/passwd:ro \
+            --volume /etc/shadow:/etc/shadow:ro \
+            --volume /etc/sudoers:/etc/sudoers:ro \
+            --volume /etc/sudoers.d:/etc/sudoers.d:ro \
+            --volume ${SSHAUTH}:${SSHAUTHSOCK} \
+            --volume ${HOMEDIR}:${HOMEDIR} \
+            --workdir /drupal \
+            --restart unless-stopped \
+            registry.lakedrops.com/docker/l3d/php-${PHP_VERSION}:${VERSION}
+          ;;
+        *)
+          docker run --name ${COMPOSE_PROJECT_NAME}_l3d -dt \
+            --hostname ${COMPOSE_PROJECT_NAME}-l3d \
+            --user ${USERID}:${GROUPID} \
+            --group-add ${GROUPIDS// / --group-add } \
+            --env L3DSHELL=${L3DSHELL} \
+            --env COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME} \
+            --env COMPOSER_DOWNGRADE=${COMPOSER_DOWNGRADE} \
+            --env PHP_VERSION=${PHP_VERSION} \
+            --env SSH_AUTH_SOCK=${SSHAUTHSOCK} \
+            --volume /var/run/docker.sock:/var/run/docker.sock \
+            --volume ${WORKDIR}:/drupal \
+            --volume /etc/group:/etc/group:ro \
+            --volume /etc/passwd:/etc/passwd:ro \
+            --volume /etc/shadow:/etc/shadow:ro \
+            --volume /etc/sudoers:/etc/sudoers:ro \
+            --volume /etc/sudoers.d:/etc/sudoers.d:ro \
+            --volume ${SSHAUTH}:${SSHAUTHSOCK} \
+            --volume ${HOMEDIR}:${HOMEDIR} \
+            --workdir /drupal \
+            --restart unless-stopped \
+            registry.lakedrops.com/docker/l3d/php-${PHP_VERSION}:${VERSION}
+      esac
     fi
     docker exec -it \
       --env HOMEDIR=${HOMEDIR} \

setup/scripts/l3d

@@ -40,7 +40,7 @@ if [[ ! -n ${ID} ]]; then
       docker run --name=l3drun -dt --rm \
         --env SCRIPTPATH=${SCRIPTPATH} \
         --env SSH_AUTH_SOCK=${SSHAUTHMAGICPATH} \
-        --volume  ${SSHAUTHMAGICPATH}:${SSHAUTHMAGICPATH} \
+        --volume ${SSHAUTHMAGICPATH}:${SSHAUTHMAGICPATH} \
         --volume /var/run/docker.sock:/var/run/docker.sock \
         --volume ${SCRIPTPATH}:/setup \
         --volume ${HOME}/.traefik:/root/.traefik \
@@ -69,20 +69,38 @@ fi
 if [[ -f ".env" ]]; then
   export $(cat .env | xargs) > /dev/null 2>&1
 fi
-export USERID=$(id -u)
-export GROUPID=$(id -g)
-export GROUPIDS=$(id -G)
-docker exec -it \
-  --env USERID=${USERID} \
-  --env GROUPID=${GROUPID} \
-  --env GROUPIDS="${GROUPIDS}" \
-  --env HOMEDIR=${HOME} \
-  --env L3DSHELL=${L3DSHELL} \
-  --env WORKDIR=${PWD} \
-  --env SSHAUTH=${SSHAUTH} \
-  --env SSHAUTHSOCK=${SSHAUTHSOCK} \
-  --env PHP_VERSION=${PHP_VERSION} \
-  --env COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME} \
-  --env COMPOSER_DOWNGRADE=${COMPOSER_DOWNGRADE} \
-  l3drun \
-  /usr/local/bin/run $@
+case "${L3DHOSTOS}" in
+  Darwin*)
+    export GROUPIDS=$(id -G)
+    docker exec -it \
+      --env GROUPIDS="${GROUPIDS}" \
+      --env HOMEDIR=${HOME} \
+      --env L3DSHELL=${L3DSHELL} \
+      --env WORKDIR=${PWD} \
+      --env SSHAUTH=${SSHAUTH} \
+      --env SSHAUTHSOCK=${SSHAUTHSOCK} \
+      --env PHP_VERSION=${PHP_VERSION} \
+      --env COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME} \
+      --env COMPOSER_DOWNGRADE=${COMPOSER_DOWNGRADE} \
+      l3drun \
+      /usr/local/bin/run $@
+    ;;
+  *)
+    export USERID=$(id -u)
+    export GROUPID=$(id -g)
+    export GROUPIDS=$(id -G)
+    docker exec -it \
+      --env USERID=${USERID} \
+      --env GROUPID=${GROUPID} \
+      --env GROUPIDS="${GROUPIDS}" \
+      --env HOMEDIR=${HOME} \
+      --env L3DSHELL=${L3DSHELL} \
+      --env WORKDIR=${PWD} \
+      --env SSHAUTH=${SSHAUTH} \
+      --env SSHAUTHSOCK=${SSHAUTHSOCK} \
+      --env PHP_VERSION=${PHP_VERSION} \
+      --env COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME} \
+      --env COMPOSER_DOWNGRADE=${COMPOSER_DOWNGRADE} \
+      l3drun \
+      /usr/local/bin/run $@
+esac

setup/scripts/setup

 #!/bin/sh
 
 cp /usr/local/bin/l3d /setup/l3d
-cp /usr/local/bin/prepareMac4L3d /setup/prepareMac4L3d
 
 echo "L3D installed successfully!"
 echo ""