Merge branch 'develop' into 'main'

Merging develop into main

See merge request !5

.gitlab-ci.yml

-# @todo: re-structure the use of image tags.
 variables:
   VERSION: ${CI_COMMIT_TAG}
+  CI_VERSION: v2.0.1
 
 before_script:
   - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
@@ -27,9 +27,9 @@ php:
   stage: build
   parallel:
     matrix:
-      - PHP: ['7.0','7.1','7.2','7.3','7.4','8.0','8.1']
+      - PHP: ['7.2','7.3','7.4','8.0','8.1']
   script:
-    - docker build --pull --build-arg PHP_VERSION=${PHP} --build-arg VERSION=${VERSION} -t ${CI_REGISTRY_IMAGE}/php-${PHP}:${VERSION} .
+    - docker build --pull --build-arg PHP_VERSION=${PHP} --build-arg VERSION=${VERSION} --build-arg CI_VERSION=${CI_VERSION} -t ${CI_REGISTRY_IMAGE}/php-${PHP}:${VERSION} .
     - docker push ${CI_REGISTRY_IMAGE}/php-${PHP}:${VERSION}
   only:
     - tags

Dockerfile

 ARG PHP_VERSION
+ARG CI_VERSION
 
-FROM registry.lakedrops.com/docker/gitlab-drupal-ci:php-${PHP_VERSION}
+FROM registry.lakedrops.com/docker/gitlab-drupal-ci/php-${PHP_VERSION}:${CI_VERSION}
 
 ARG VERSION