Skip to content
Snippets Groups Projects
Commit 35a4a835 authored by jurgenhaas's avatar jurgenhaas
Browse files

Try to use real docker socket on Mac

parent e9afb47c
Branches
Tags
1 merge request!1Feature/macos
......@@ -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}
......
......@@ -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
)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment