Skip to content
Snippets Groups Projects
Commit ec46c78d authored by jurgenhaas's avatar jurgenhaas
Browse files

Merge branch 'develop' into 'main'

Merging develop into main

See merge request !17
parents 597b9d09 e17e37d6
Branches
Tags v2.4.1 v2.4.2
1 merge request!17Merging develop into main
......@@ -26,7 +26,7 @@ function listnetworks() {
fi
printf "Active L3D networks:"
for NETWORKID in `cat /tmp/l3d.lst`; do
printf " %s" "$(docker inspect $NETWORKID | jq -r .[0].Name | cut -d'_' -f 2)"
printf " %s" "$(docker inspect $NETWORKID | jq -r .[0].Name | cut -d'_' -f 1)"
done
echo ""
rm /tmp/l3d.lst
......
......@@ -125,11 +125,18 @@ function startContainer() {
return
fi
fi
start_params=(
--env HOMEDIR=${HOMEDIR}
--env WORKDIR=${WORKDIR}
--env SSHAUTH=${SSHAUTH}
)
if [[ "$PHP_VERSION" != "unknown" ]]; then
start_params+=(
--env PHP_VERSION=${PHP_VERSION}
)
fi
docker exec -it \
--env HOMEDIR=${HOMEDIR} \
--env WORKDIR=${WORKDIR} \
--env SSHAUTH=${SSHAUTH} \
--env PHP_VERSION=${PHP_VERSION} \
"${start_params[@]}" \
${COMPOSE_PROJECT_NAME}_l3d \
/usr/local/bin/.start
exitContainer
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment