diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c468a08a940b69588bc714ff87242dba7ae8b3e9..b5a5f5638382eb8512a605debe6568334c7371f1 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 57c6aebf0f8bcc8c768f72ab3a2e26ce34c249e3..d6625e44cc828a69232dd237338d7b23f728772c 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 dc8bcdef41bab194282e685f6a84d1c5c0004cdc..7614fb2c3409f199f32bca09ea051ceb825e259d 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 dfbf09f648b9a8c29b6889254bdbcbc05c7e2cfc..739dedffe9b51d09e91f6cc4dca62dd967a91a8f 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 975dc4f7e7bbf279923b41ca24ddb823d7a73a1b..b19a2128b504271c99e4a81225ba4ec1f33170f0 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