From 35a4a8357f8f5dd7fe4dac4cd70cc54f9b32a200 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Tue, 5 Jan 2021 17:37:53 +0100
Subject: [PATCH] Try to use real docker socket on Mac
---
run/scripts/start | 2 +-
setup/scripts/l3d | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/run/scripts/start b/run/scripts/start
index dbf3f2e..b689b26 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 4407e1b..f5ed549 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
)
--
GitLab