From 675c79d9c9578a05208778ac90d7e525afe67f97 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen.haas@lakedrops.com>
Date: Tue, 30 Aug 2022 16:43:09 +0200
Subject: [PATCH] docker/l3d#117 Read PHP_VERSION from .lakedrops.yml if
available
---
setup/scripts/l3d | 8 ++++++++
start.sh | 3 +++
2 files changed, 11 insertions(+)
diff --git a/setup/scripts/l3d b/setup/scripts/l3d
index ac6416d..5e8f6b5 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 dcb6b32..1913a6e 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
--
GitLab