From 55b9ce98fefb26dbc92b4e8477173fc6a12c7c47 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Thu, 7 Jan 2021 09:12:15 +0100
Subject: [PATCH] Plan B: stay with user root on Mac
---
run/scripts/start | 13 +++++++------
setup/scripts/l3d | 8 +++++---
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/run/scripts/start b/run/scripts/start
index d9912d1..857beb7 100755
--- a/run/scripts/start
+++ b/run/scripts/start
@@ -38,8 +38,6 @@ function startContainer {
else
start_params=(
--hostname ${COMPOSE_PROJECT_NAME}-l3d
- --user ${USERID}:${GROUPID}
- --group-add ${GROUPIDS// / --group-add }
--env L3DVERSION=${L3DVERSION}
--env L3DSHELL=${L3DSHELL}
--env HOME=/home/${USERNAME}
@@ -56,16 +54,19 @@ function startContainer {
)
if [[ ${L3DHOSTOS} != Darwin ]]; then
start_params+=(
+ --user ${USERID}:${GROUPID}
+ --group-add ${GROUPIDS// / --group-add }
--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
)
- else
- start_params+=(
- --volume ${HOMEDIR}/.passwd:/etc/passwd:ro
- )
+ # else
+ # (see #62) Disabled for now.
+ #start_params+=(
+ # --volume ${HOMEDIR}/.passwd:/etc/passwd:ro
+ #)
fi
docker run --name ${COMPOSE_PROJECT_NAME}_l3d -dt \
"${start_params[@]}" \
diff --git a/setup/scripts/l3d b/setup/scripts/l3d
index 9f5860a..03ba4fb 100755
--- a/setup/scripts/l3d
+++ b/setup/scripts/l3d
@@ -17,11 +17,13 @@ case "${L3DHOSTOS}" in
else
# This works on MacOS when coreutils is installed.
SCRIPTPATH="$(dirname "$(greadlink -f "$0")")"
- L3DDOCKERHOST="$(dirname "$(greadlink -f "/var/run/docker.sock")")/docker.sock"
+ # (see #62) L3DDOCKERHOST="$(dirname "$(greadlink -f "/var/run/docker.sock")")/docker.sock"
fi
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
+ # (see #62) Write a fake passwd file which will later be mounted into containers.
+ # echo "${USERNAME}:x:${USERID}:${GROUPID}:${USERNAME},,,:/home/${USERNAME}:${L3DSHELL}" >${HOME}/.passwd
+ USERNAME=root
+
# This variable is used to access the ssh agent on MacOS.
SSHAUTHMAGICPATH="/run/host-services/ssh-auth.sock"
SSHAUTH=${SSHAUTHMAGICPATH}
--
GitLab