#62 restructure code

run/scripts/start

@@ -45,18 +45,19 @@ function startContainer {
                     --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 \
                   ) 
       if [[ ${L3DHOSTOS} != Darwin ]]; then
-        start_params+=(--user ${USERID}:${GROUPID})
+        start_params+=( --user ${USERID}:${GROUPID} \
+                        --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 \
+                      )
       fi
       docker run --name ${COMPOSE_PROJECT_NAME}_l3d -dt \
         "${start_params[@]}" \

setup/scripts/l3d

@@ -34,26 +34,23 @@ fi
 touch ${HOME}/.gitconfig
 touch ${HOME}/.gitignore_global
 
+# l3d container
 ID=$(docker container ls --all -q -f name=^l3drun$)
-
-# Create l3drun container parameters
-l3drun_params=( --env L3DHOSTOS=${L3DHOSTOS} \
-                --env SCRIPTPATH=${SCRIPTPATH} \
-                --volume /var/run/docker.sock:/var/run/docker.sock \
-                --volume ${SCRIPTPATH}:/setup \
-                --volume ${HOME}/.traefik:/root/.traefik \
-              ) 
-if [[ ${L3DHOSTOS} == Darwin ]]; then
-    l3drun_params+=( --env SSH_AUTH_SOCK=${SSHAUTHMAGICPATH} \
-                     --volume ${SSHAUTHMAGICPATH}:${SSHAUTHMAGICPATH} \
-                    )
-fi
-
-# Execute l3drun container
 if [[ ! -n ${ID} ]]; then
+  # Create l3drun container parameters
+  l3drun_params=( --env L3DHOSTOS=${L3DHOSTOS} \
+                  --env SCRIPTPATH=${SCRIPTPATH} \
+                  --volume /var/run/docker.sock:/var/run/docker.sock \
+                  --volume ${SCRIPTPATH}:/setup \
+                  --volume ${HOME}/.traefik:/root/.traefik \
+                ) 
+  if [[ ${L3DHOSTOS} == Darwin ]]; then
+      l3drun_params+=(--volume ${SSHAUTHMAGICPATH}:${SSHAUTHMAGICPATH})
+  fi
+  # Execute l3drun container
   docker run --name=l3drun -dt --rm \
     "${l3drun_params[@]}" \
-    registry.lakedrops.com/docker/l3d/run:v1.8.2-mac0.3
+    registry.lakedrops.com/docker/l3d/run:v1.8.2-mac0.4
 fi
 
 # Set l3d shell