diff --git a/run/scripts/start b/run/scripts/start index dbf3f2ecc5ce298b4cd9e08fa82bead45d195081..b689b26a6615b10157f0d3e2f36e44386b644f08 100755 --- a/run/scripts/start +++ b/run/scripts/start @@ -45,7 +45,7 @@ function startContainer { --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 ${DOCKERSOCKHOST}:/var/run/docker.sock --volume ${WORKDIR}:/drupal --volume ${SSHAUTH}:${SSHAUTHSOCK} --volume ${HOMEDIR}:/home/${USERNAME} diff --git a/setup/scripts/l3d b/setup/scripts/l3d index 4407e1b509da551a82f67fc23dc2f60e2abc8ca1..f5ed549009b2976fa475e87b713a0e3b787f4029 100755 --- a/setup/scripts/l3d +++ b/setup/scripts/l3d @@ -7,6 +7,7 @@ SSHAUTH=${SSH_AUTH_SOCK} SSHAUTHSOCK=/ssh-agent USERID=$(id -u) USERNAME=${USER} +DOCKERSOCKHOST=/var/run/docker.sock case "${L3DHOSTOS}" in Darwin*) @@ -16,6 +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")")" fi # Write a fake passwd file which will later be mounted into containers. echo "${USERNAME}:x:${USERID}:${GROUPID}:${USERNAME},,,:/home/${USERNAME}:${L3DSHELL}" >${HOME}/.passwd @@ -47,7 +49,8 @@ if [[ ! -n ${ID} ]]; then l3drun_params=( --env L3DHOSTOS=${L3DHOSTOS} --env SCRIPTPATH=${SCRIPTPATH} - --volume /var/run/docker.sock:/var/run/docker.sock + --env DOCKERSOCKHOST=${DOCKERSOCKHOST} + --volume ${DOCKERSOCKHOST}:/var/run/docker.sock --volume ${SCRIPTPATH}:/setup --volume ${HOME}/.traefik:/root/.traefik )