Merge branch 'release/v1.15.5'

run/scripts/start

@@ -37,7 +37,7 @@ function startContainer {
     else
       docker run --name ${COMPOSE_PROJECT_NAME}_l3d -dt \
         --hostname ${COMPOSE_PROJECT_NAME}-l3d \
-        --user $(id -u):$(id -g) \
+        --user ${USERID}:${GROUPID} \
         --env L3DSHELL=${L3DSHELL} \
         --env COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME} \
         --env COMPOSER_DOWNGRADE=${COMPOSER_DOWNGRADE} \

setup/scripts/l3d

@@ -49,7 +49,11 @@ fi
 if [[ -f ".env" ]]; then
   export $(cat .env | xargs) > /dev/null 2>&1
 fi
+export USERID=$(id -u)
+export GROUPID=$(id -g)
 docker exec -it \
+  --env USERID=${USERID} \
+  --env GROUPID=${GROUPID} \
   --env HOMEDIR=${HOME} \
   --env L3DSHELL=${L3DSHELL} \
   --env WORKDIR=${PWD} \