From eeaa9a77175428999143a7da03df38422233e14d Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Mon, 25 Jan 2021 16:51:22 +0100
Subject: [PATCH] gitlab-ci-cd/drupal#3 Make PHP version configurable, default
to 7.4
---
test-and-deploy.yml | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/test-and-deploy.yml b/test-and-deploy.yml
index 55d3f91..b7b7166 100644
--- a/test-and-deploy.yml
+++ b/test-and-deploy.yml
@@ -1,5 +1,6 @@
variables:
- PHP_VERSION: 7.4
+ PHP_MAJOR_VERSION: 7
+ PHP_MINOR_VERSION: 4
stages:
- validation
@@ -69,7 +70,7 @@ stages:
stage: validation
tags:
- default
- image: registry.lakedrops.com/docker/gitlab-drupal-ci:php-${PHP_VERSION}
+ image: registry.lakedrops.com/docker/gitlab-drupal-ci:php-${PHP_MAJOR_VERSION}.${PHP_MINOR_VERSION}
variables:
GIT_STRATEGY: none
script: |
@@ -117,7 +118,7 @@ stages:
stage: buildprod
tags:
- default
- image: registry.lakedrops.com/docker/gitlab-drupal-ci:php-${PHP_VERSION}
+ image: registry.lakedrops.com/docker/gitlab-drupal-ci:php-${PHP_MAJOR_VERSION}.${PHP_MINOR_VERSION}
cache:
<<: *cache_prod
policy: pull-push
@@ -153,7 +154,7 @@ stages:
stage: build
tags:
- default
- image: registry.lakedrops.com/docker/gitlab-drupal-ci:php-${PHP_VERSION}
+ image: registry.lakedrops.com/docker/gitlab-drupal-ci:php-${PHP_MAJOR_VERSION}.${PHP_MINOR_VERSION}
cache:
<<: *cache_default
policy: pull-push
@@ -226,7 +227,7 @@ stages:
stage: prepare
tags:
- default
- image: registry.lakedrops.com/docker/gitlab-drupal-ci:php-${PHP_VERSION}
+ image: registry.lakedrops.com/docker/gitlab-drupal-ci:php-${PHP_MAJOR_VERSION}.${PHP_MINOR_VERSION}
variables:
GIT_STRATEGY: none
script: |
@@ -257,7 +258,7 @@ stages:
stage: prepare
tags:
- default
- image: registry.lakedrops.com/docker/gitlab-drupal-ci:php-${PHP_VERSION}
+ image: registry.lakedrops.com/docker/gitlab-drupal-ci:php-${PHP_MAJOR_VERSION}.${PHP_MINOR_VERSION}
variables:
GIT_STRATEGY: none
script: |
@@ -284,7 +285,7 @@ stages:
stage: prepare
tags:
- default
- image: registry.lakedrops.com/docker/gitlab-drupal-ci:php-${PHP_VERSION}
+ image: registry.lakedrops.com/docker/gitlab-drupal-ci:php-${PHP_MAJOR_VERSION}.${PHP_MINOR_VERSION}
variables:
GIT_STRATEGY: none
script:
@@ -310,7 +311,7 @@ stages:
stage: test
tags:
- default
- image: registry.lakedrops.com/docker/gitlab-drupal-ci:php-${PHP_VERSION}
+ image: registry.lakedrops.com/docker/gitlab-drupal-ci:php-${PHP_MAJOR_VERSION}.${PHP_MINOR_VERSION}
variables:
GIT_STRATEGY: none
script: |
@@ -339,7 +340,7 @@ stages:
stage: test
tags:
- default
- image: registry.lakedrops.com/docker/gitlab-drupal-ci:php-${PHP_VERSION}
+ image: registry.lakedrops.com/docker/gitlab-drupal-ci:php-${PHP_MAJOR_VERSION}.${PHP_MINOR_VERSION}
variables:
GIT_STRATEGY: none
script: |
@@ -372,7 +373,7 @@ stages:
stage: test
tags:
- default
- image: registry.lakedrops.com/docker/gitlab-drupal-ci:php-${PHP_VERSION}
+ image: registry.lakedrops.com/docker/gitlab-drupal-ci:php-${PHP_MAJOR_VERSION}.${PHP_MINOR_VERSION}
variables:
GIT_STRATEGY: none
script: |
@@ -404,7 +405,7 @@ stages:
stage: test
tags:
- default
- image: registry.lakedrops.com/docker/gitlab-drupal-ci:php-${PHP_VERSION}
+ image: registry.lakedrops.com/docker/gitlab-drupal-ci:php-${PHP_MAJOR_VERSION}.${PHP_MINOR_VERSION}
variables:
GIT_STRATEGY: none
script: |
--
GitLab