diff --git a/run/scripts/start b/run/scripts/start index c026eeb730b2952961035e1f411050a3503b7a80..57828d3f2acdc36697198c7d7f27e711fb0163c7 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 873a62dffd3ad0b0ab17252fd3888152eb5536d5..9f5860ad256eea7ef5cf742275b73a1829f5ad26 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.