From 5a8de692780f98cb4a1f27c774b634e94c79b631 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Wed, 6 Jan 2021 17:06:50 +0100
Subject: [PATCH] Use group id 1 on Mac
---
run/scripts/start | 1 +
setup/scripts/l3d | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/run/scripts/start b/run/scripts/start
index c026eeb..57828d3 100755
--- a/run/scripts/start
+++ b/run/scripts/start
@@ -40,6 +40,7 @@ function startContainer {
--hostname ${COMPOSE_PROJECT_NAME}-l3d
--user ${USERID}:${GROUPID}
--group-add ${GROUPIDS// / --group-add }
+ --env L3DVERSION=${L3DVERSION} \
--env L3DSHELL=${L3DSHELL}
--env COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME}
--env COMPOSER_DOWNGRADE=${COMPOSER_DOWNGRADE}
diff --git a/setup/scripts/l3d b/setup/scripts/l3d
index 873a62d..9f5860a 100755
--- a/setup/scripts/l3d
+++ b/setup/scripts/l3d
@@ -19,7 +19,7 @@ case "${L3DHOSTOS}" in
SCRIPTPATH="$(dirname "$(greadlink -f "$0")")"
L3DDOCKERHOST="$(dirname "$(greadlink -f "/var/run/docker.sock")")/docker.sock"
fi
- GROUPID=$(cut -d: -f3 < <(getent group docker))
+ GROUPID=1
# Write a fake passwd file which will later be mounted into containers.
echo "${USERNAME}:x:${USERID}:${GROUPID}:${USERNAME},,,:/home/${USERNAME}:${L3DSHELL}" >${HOME}/.passwd
# This variable is used to access the ssh agent on MacOS.
--
GitLab