diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a4e4221c8d4995c43442fff660409dadd5244aa3..c468a08a940b69588bc714ff87242dba7ae8b3e9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,3 +45,11 @@ php-7.2: - docker push ${CI_REGISTRY_IMAGE}/php-7.2:${VERSION} only: - tags + +php-7.3: + stage: build + script: + - docker build --pull --build-arg PHP_VERSION=7.3 --build-arg VERSION=${VERSION} -t ${CI_REGISTRY_IMAGE}/php-7.3:${VERSION} . + - docker push ${CI_REGISTRY_IMAGE}/php-7.3:${VERSION} + only: + - tags diff --git a/CHANGELOG b/CHANGELOG index a757ee26542ba3147e6a60d69dc71c0e4bec9862..763d4747af77b6fa59f1056c3e25a2d2c38e3845 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,13 @@ -v1.11.1 2002-02-10 +v1.12.0 2020-01-12 ------------------ -Force update to update to composer version 1.9.3 +docker/l3d#4 Set permissions after "drush generate" +docker/l3d#39 Update to git-extras version 5.1.0 by hard-copying column as a binary +docker/l3d#34 Add support for PHP 7.3 +docker/l3d#36 Add apropos which also brings man +docker/l3d#37 Add phpstan script which runs in its own docker container +docker/l3d#38 Update Docker to 19.03.5 +docker/l3d#38 Update Docker Compose to 1.25.1 +docker/l3d#40 Update to Python 3 v1.11.0 2020-01-11 ------------------ diff --git a/Dockerfile b/Dockerfile index 23b5d969ecb1669c205e16e81ba9b5313cf4b705..05d54a45644d4c96af7a770f2edfd8d07c70930a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,9 @@ ARG PHP_VERSION -ARG VERSION FROM registry.lakedrops.com/docker/gitlab-drupal-ci:php-${PHP_VERSION} +ARG VERSION + LABEL com.example.vendor="LakeDrops" \ maintainer="juergen.haas@lakedrops.com" \ version="${VERSION}" \ diff --git a/README.md b/README.md index 5f89cb4ce9824439cc0c741f6de75347a76b203c..f89865944f0f44cb7dac3ef4e123f95196488626 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` or `7.2`), 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` 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. 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 3413f35874b1e081c2988b243a65a41fcfd1598e..dfbf09f648b9a8c29b6889254bdbcbc05c7e2cfc 100755 --- a/run/scripts/reset +++ b/run/scripts/reset @@ -11,6 +11,8 @@ export PHP_VERSION=7.1 /usr/local/bin/update export PHP_VERSION=7.2 /usr/local/bin/update +export PHP_VERSION=7.3 +/usr/local/bin/update echo "Cleaning old container" docker kill l3drun >/dev/null diff --git a/run/scripts/start b/run/scripts/start index 762016fd88268aee545326b87aab2af70af3baad..445e18395ee4de6e52feb3048a0a2f1cdb913822 100755 --- a/run/scripts/start +++ b/run/scripts/start @@ -8,6 +8,7 @@ function getConfig { 7.0 ) break;; 7.1 ) break;; 7.2 ) break;; + 7.3 ) break;; * ) echo "Version not supported.";; esac done