Merge branch 'release/v1.14.0' into master

.gitlab-ci.yml

@@ -53,3 +53,11 @@ php-7.3:
     - docker push ${CI_REGISTRY_IMAGE}/php-7.3:${VERSION}
   only:
     - tags
+
+php-7.4:
+  stage: build
+  script:
+    - docker build --pull --build-arg PHP_VERSION=7.4 --build-arg VERSION=${VERSION} -t ${CI_REGISTRY_IMAGE}/php-7.4:${VERSION} .
+    - docker push ${CI_REGISTRY_IMAGE}/php-7.4:${VERSION}
+  only:
+    - tags

CHANGELOG

+v1.14.0 2020-10-15
+------------------
+docker/l3d#46 Add support for PHP 7.4
+
 v1.13.1 2020-07-15
 ------------------
 Map the local .gitignore_global into containers

README.md

@@ -53,7 +53,7 @@ The same test also works with other hosts where your public key is configured as
 
 Go to the project root for which you want to use **L3D** and execute the installed script: simply type `l3d` at the command prompt.
 
-It will ask you for the PHP version (input `7.0`, `7.1`, `7.2` or `7.3`), the project name and template to be used. Then it will download the matching **L3D** image and start a container for you.
+It will ask you for the PHP version (input `7.0`, `7.1`, `7.2`, `7.3` or `7.4`), the project name and template to be used. Then it will download the matching **L3D** image and start a container for you.
 
 Inside the container you'll find the directory `/drupal` which contains everything from your project's root. You can work from there by using these available tools:
 

run/scripts/reset

@@ -13,6 +13,8 @@ export PHP_VERSION=7.2
 /usr/local/bin/update
 export PHP_VERSION=7.3
 /usr/local/bin/update
+export PHP_VERSION=7.4
+/usr/local/bin/update
 
 echo "Cleaning old container"
 docker kill l3drun >/dev/null

run/scripts/start

@@ -9,6 +9,7 @@ function getConfig {
             7.1 ) break;;
             7.2 ) break;;
             7.3 ) break;;
+            7.4 ) break;;
             * ) echo "Version not supported.";;
         esac
     done