Merge branch 'develop' into 'main'

Merging develop into main

See merge request !16

run/Dockerfile

@@ -14,7 +14,7 @@ ARG glibc_version=2.28-r0
 
 ADD scripts/* /usr/local/bin/
 
-RUN apk add --no-cache bash curl jq && \
+RUN apk add --no-cache bash curl jq yq && \
     wget -q https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub -O /etc/apk/keys/sgerrand.rsa.pub && \
     wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${glibc_version}/glibc-${glibc_version}.apk && \
     apk add --no-cache --force-overwrite glibc-${glibc_version}.apk && \

run/scripts/run

@@ -2,6 +2,13 @@
 
 export L3DVERSION='{{ version }}'
 
+if [[ "$L3D_CONFIG" != "[]" ]]; then
+  V=$(echo "$L3D_CONFIG" | yq eval .docker4drupal.php.version)
+  if [[ "$V" != "null" ]]; then
+    export PHP_VERSION=$V
+  fi
+fi
+
 COMMAND=start
 if [[ -n "$1" ]]; then
   if [[ -f "/usr/local/bin/$1" ]]; then

run/scripts/start

@@ -129,6 +129,7 @@ function startContainer() {
       --env HOMEDIR=${HOMEDIR} \
       --env WORKDIR=${WORKDIR} \
       --env SSHAUTH=${SSHAUTH} \
+      --env PHP_VERSION=${PHP_VERSION} \
       ${COMPOSE_PROJECT_NAME}_l3d \
       /usr/local/bin/.start
     exitContainer

setup/scripts/l3d

@@ -85,13 +85,9 @@ fi
 if [[ -f ".env" ]]; then
   export $(cat .env | xargs) > /dev/null 2>&1
 fi
+L3D_CONFIG=[]
 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
+  L3D_CONFIG=$(cat .lakedrops.yml)
 fi
 
 # Create project container parameters
@@ -103,6 +99,7 @@ project_params=(
   --env HOMEDIR=${HOME}
   --env L3DSHELL=${L3DSHELL}
   --env L3D_ALWAYS_CLEANUP=${L3D_ALWAYS_CLEANUP}
+  --env L3D_CONFIG=${L3D_CONFIG}
   --env WORKDIR=${PWD}
   --env SSHAUTH=${SSHAUTH}
   --env SSHAUTHSOCK=${SSHAUTHSOCK}

start.sh

@@ -214,14 +214,19 @@ function setupAhoy {
   fi
 }
 
+if [[ -n ${PHP_VERSION} ]]; then
+  echo "PHP_VERSION=${PHP_VERSION}" >>.env
+fi
 readEnv
 # Validate PHP version
 INSTALLED_PHP_VERSION=$(php -r "echo(substr(phpversion(),0,3));")
 if [[ "$INSTALLED_PHP_VERSION" != "$PHP_VERSION" ]]; then
-  echo -e "\\033[31m ============================================= \\033[0m"
+  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"
+  echo -e "\\033[31m ===================================================== \\033[0m"
   if [[ "${COMPOSE_PROJECT_NAME}" != "." ]]; then
+    echo -e "\\033[31m Killed the outdated container, please start again !!! \\033[0m"
+    echo -e "\\033[31m ===================================================== \\033[0m"
     docker rm -f ${COMPOSE_PROJECT_NAME}_l3d
   fi
 fi