Skip to content
Snippets Groups Projects

Bug fix, when docker-compose.yml exists but doesn't contain the project name

Merged jurgenhaas requested to merge develop into main
2 files
+ 23
5
Compare changes
  • Side-by-side
  • Inline
Files
2
+ 18
4
@@ -2,8 +2,14 @@
function getConfig() {
if [[ "$L3D_COMPOSE" != "[]" ]]; then
COMPOSE_PROJECT_NAME=$(yq .name $L3D_COMPOSE)
PHP_VERSION=$(yq .services.php.image $L3D_COMPOSE | cut -d':' -f 2)
V=$(yq .name $L3D_COMPOSE)
if [[ "$V" != "null" ]]; then
COMPOSE_PROJECT_NAME=$V
fi
V=$(yq .services.php.image $L3D_COMPOSE | cut -d':' -f 2)
if [[ "$V" != "null" ]]; then
PHP_VERSION=$V
fi
rm "$L3D_COMPOSE"
fi
if [[ ! -n ${PHP_VERSION} ]]; then
@@ -113,7 +119,11 @@ function startContainer() {
--env SSHAUTH=${SSHAUTH}
)
fi
docker run -it --rm \
FLAG=
if [[ -t 1 ]]; then
FLAG=-it
fi
docker run $FLAG --rm \
"${start_params[@]}" \
registry.lakedrops.com/docker/l3d/php-${PHP_VERSION}:${L3DVERSION} \
/usr/local/bin/.start
@@ -135,7 +145,11 @@ function startContainer() {
--env PHP_VERSION=${PHP_VERSION}
)
fi
docker exec -it \
FLAG=
if [[ -t 1 ]]; then
FLAG=-it
fi
docker exec $FLAG \
"${start_params[@]}" \
${COMPOSE_PROJECT_NAME}_${USERNAME}_l3d \
/usr/local/bin/.start
Loading