diff --git a/setup/scripts/l3d b/setup/scripts/l3d index ac6416dc9c094455a9e12eee15595a69fdc3c1d4..5e8f6b5a7a006a279782e46738c9a2262449ecf8 100755 --- a/setup/scripts/l3d +++ b/setup/scripts/l3d @@ -85,6 +85,14 @@ fi if [[ -f ".env" ]]; then export $(cat .env | xargs) > /dev/null 2>&1 fi +if [[ -f ".lakedrops.yml" ]]; then + V=$(yq eval .docker4drupal.php.version .lakedrops.yml) + if [[ "$V" != "null" ]]; then + PHP_VERSION=$V + echo "PHP_VERSION=${PHP_VERSION}" >>.env + env -i $(cat .env | xargs) >.env + fi +fi # Create project container parameters project_params=( diff --git a/start.sh b/start.sh index dcb6b327f86ecf13f37f457b1e4331e29a8f93f1..1913a6e00860716cd716a99f448b40bd93a02485 100755 --- a/start.sh +++ b/start.sh @@ -221,6 +221,9 @@ if [[ "$INSTALLED_PHP_VERSION" != "$PHP_VERSION" ]]; then echo -e "\\033[31m ============================================= \\033[0m" echo -e "\\033[31m ERROR: PHP $INSTALLED_PHP_VERSION installed but $PHP_VERSION expected !!! \\033[0m" echo -e "\\033[31m ============================================= \\033[0m" + if [[ "${COMPOSE_PROJECT_NAME}" != "." ]]; then + docker container ls --all -q -f name=^${COMPOSE_PROJECT_NAME}_l3d + fi fi if [[ "$COMPOSER_DOWNGRADE" == "1" ]]; then composer self-update --1