From 9f97e00a1ef80c8df495eb3fe3a188058282040c Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Thu, 15 Oct 2020 13:57:16 +0200
Subject: [PATCH] docker/l3d#46 Add PHP 7.4
---
.gitlab-ci.yml | 8 ++++++++
CHANGELOG | 4 ++++
README.md | 2 +-
run/scripts/reset | 2 ++
run/scripts/start | 1 +
5 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c468a08..b5a5f56 100644
--- a/.gitlab-ci.yml
+++ b/.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
diff --git a/CHANGELOG b/CHANGELOG
index 57c6aeb..d6625e4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+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
diff --git a/README.md b/README.md
index dc8bcde..7614fb2 100644
--- a/README.md
+++ b/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:
diff --git a/run/scripts/reset b/run/scripts/reset
index dfbf09f..739dedf 100755
--- a/run/scripts/reset
+++ b/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
diff --git a/run/scripts/start b/run/scripts/start
index 975dc4f..b19a212 100755
--- a/run/scripts/start
+++ b/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
--
GitLab