Merge branch 'release/25.1.3'

.circleci/config.yml

@@ -217,7 +217,10 @@ jobs:
 
       - checkout
       - *step_process_codebase_for_ci
-      - *step_setup_remote_docker
+
+      - run:
+          name: Validate Composer configuration
+          command: composer validate --strict || [ "${VORTEX_CI_COMPOSER_VALIDATE_IGNORE_FAILURE:-0}" -eq 1 ]
 
       #;< !PROVISION_USE_PROFILE
       - run:
@@ -242,6 +245,8 @@ jobs:
               echo "Linting ${file}" && cat "${file}" | docker run --rm -i hadolint/hadolint || [ "${VORTEX_CI_HADOLINT_IGNORE_FAILURE:-0}" -eq 1 ]
             done
 
+      - *step_setup_remote_docker
+
       - run:
           name: Login to container registry
           command: ./scripts/vortex/login-container-registry.sh
@@ -256,10 +261,6 @@ jobs:
             mkdir -p "${VORTEX_EXPORT_CODE_DIR}"
             docker compose cp -L cli:"/app/." "${VORTEX_EXPORT_CODE_DIR}"
 
-      - run:
-          name: Validate Composer configuration
-          command: docker compose exec cli composer validate --strict || [ "${VORTEX_CI_COMPOSER_VALIDATE_IGNORE_FAILURE:-0}" -eq 1 ]
-
       - run:
           name: Install development dependencies
           command: |
@@ -268,7 +269,7 @@ jobs:
               COMPOSER_MEMORY_LIMIT=-1 composer --ansi install --prefer-dist"
 
       - run:
-          name: Validate Composer configuration normalised
+          name: Validate Composer configuration normalized
           command: docker compose exec -T cli composer normalize --dry-run || [ "${VORTEX_CI_COMPOSER_NORMALIZE_IGNORE_FAILURE:-0}" -eq 1 ]
 
       - run:

.docker/clamav.dockerfile

@@ -9,9 +9,9 @@
 #
 # @see https://hub.docker.com/r/uselagoon/commons/tags
 # @see https://github.com/uselagoon/lagoon-images/tree/main/images/commons
-FROM uselagoon/commons:24.12.0 AS commons
+FROM uselagoon/commons:25.1.0 AS commons
 
-FROM clamav/clamav:1.4.1
+FROM clamav/clamav:1.4.2
 
 COPY --from=commons /lagoon /lagoon
 COPY --from=commons /bin/fix-permissions /bin/ep /bin/docker-sleep /bin/wait-for /bin/

.docker/cli.dockerfile

@@ -6,7 +6,7 @@
 #
 # @see https://hub.docker.com/r/uselagoon/php-8.3-cli-drupal/tags
 # @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-cli-drupal
-FROM uselagoon/php-8.3-cli-drupal:24.12.0
+FROM uselagoon/php-8.3-cli-drupal:25.1.0
 
 # Add missing variables.
 # @todo Remove once https://github.com/uselagoon/lagoon/issues/3121 is resolved.

.docker/database.dockerfile

@@ -8,7 +8,7 @@
 # @see https://github.com/drevops/mariadb-drupal-data
 #
 # The ARG value will be updated with a value passed from docker-compose.yml
-ARG IMAGE=uselagoon/mariadb-10.11-drupal:24.12.0
+ARG IMAGE=uselagoon/mariadb-10.11-drupal:25.1.0
 
 # hadolint ignore=DL3006
 FROM ${IMAGE}

.docker/nginx-drupal.dockerfile

@@ -9,7 +9,7 @@ FROM ${CLI_IMAGE:-cli} AS cli
 
 # @see https://hub.docker.com/r/uselagoon/nginx-drupal/tags
 # @see https://github.com/uselagoon/lagoon-images/tree/main/images/nginx-drupal
-FROM uselagoon/nginx-drupal:24.12.0
+FROM uselagoon/nginx-drupal:25.1.0
 
 # Webroot is used for Nginx docroot configuration.
 ARG WEBROOT=web

.docker/php.dockerfile

@@ -10,7 +10,7 @@ FROM ${CLI_IMAGE:-cli} AS cli
 
 # @see https://hub.docker.com/r/uselagoon/php-8.3-fpm/tags
 # @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-fpm
-FROM uselagoon/php-8.3-fpm:24.12.0
+FROM uselagoon/php-8.3-fpm:25.1.0
 
 RUN apk add --no-cache tzdata
 

.docker/solr.dockerfile

@@ -5,7 +5,7 @@ FROM ${CLI_IMAGE:-cli} AS cli
 
 # @see https://hub.docker.com/r/uselagoon/solr-8/tags
 # @see https://github.com/uselagoon/lagoon-images/blob/main/images/solr/8.Dockerfile
-FROM uselagoon/solr-8:24.12.0
+FROM uselagoon/solr-8:25.1.0
 
 # Solr Jump-start config needs to be manually copied from search_api_solr module
 # /app/docroot/modules/contrib/search_api_solr/jump-start/solr8/config-set.

.github/workflows/build-test-deploy.yml

@@ -176,6 +176,10 @@ jobs:
       - name: Process the codebase to run in CI
         run: find . -name "docker-compose.yml" -print0 | xargs -0 -I {} sh -c "sed -i -e '/###/d' {} && sed -i -e 's/##//' {}"
 
+      - name: Validate Composer configuration
+        run: composer validate --strict
+        continue-on-error: ${{ vars.VORTEX_CI_COMPOSER_VALIDATE_IGNORE_FAILURE == '1' }}
+
       #;< !PROVISION_USE_PROFILE
       - name: Create cache keys files for database caching
         run: |
@@ -228,18 +232,15 @@ jobs:
           path: "/tmp/workspace/code"
           include-hidden-files: true
           if-no-files-found: error
-
-      - name: Validate Composer configuration
-        run: docker compose exec cli composer validate --strict
-        continue-on-error: ${{ vars.VORTEX_CI_COMPOSER_VALIDATE_IGNORE_FAILURE == '1' }}
+          retention-days: 1
 
       - name: Install development dependencies
         run: |
           docker compose exec $(env | cut -f1 -d= | sed 's/^/-e /') -T cli bash -c " \
             if [ -n \"${GITHUB_TOKEN:-}\" ]; then export COMPOSER_AUTH='{\"github-oauth\": {\"github.com\": \"${GITHUB_TOKEN-}\"}}'; fi && \
             COMPOSER_MEMORY_LIMIT=-1 composer --ansi install --prefer-dist"
 
-      - name: Validate Composer configuration normalised
+      - name: Validate Composer configuration normalized
         run: docker compose exec -T cli composer normalize --dry-run
         continue-on-error: ${{ vars.VORTEX_CI_COMPOSER_NORMALIZE_IGNORE_FAILURE == '1' }}
 

.github/workflows/renovate.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: suzuki-shunsuke/github-action-renovate-config-validator@v1.1.1
 
       - name: Self-hosted Renovate
-        uses: renovatebot/github-action@v41.0.9
+        uses: renovatebot/github-action@v41.0.11
         with:
           configurationFile: renovate.json
           token: ${{ secrets.RENOVATE_TOKEN }}

.vortex/tests/bats/circleci.bats

@@ -28,8 +28,7 @@ load _helper.circleci.bash
 
     assert_contains "homepage.feature" "${artifact_path_runner_0}"
     assert_contains "login.feature" "${artifact_path_runner_0}"
-    # @see https://github.com/drevops/vortex/issues/1461
-    # assert_contains "clamav.feature" "${artifact_path_runner_0}"
+    assert_contains "clamav.feature" "${artifact_path_runner_0}"
     assert_not_contains "search.feature" "${artifact_path_runner_0}"
 
     artifact_path_runner_1="$(echo "${artifacts_data}" | jq -r '.items | map(select(.node_index == 1).path) | join("\n")')"
@@ -38,8 +37,7 @@ load _helper.circleci.bash
 
     assert_contains "homepage.feature" "${artifact_path_runner_1}"
     assert_contains "login.feature" "${artifact_path_runner_1}"
-    # @see https://github.com/drevops/vortex/issues/1461
-    # assert_not_contains "clamav.feature" "${artifact_path_runner_1}"
+    assert_not_contains "clamav.feature" "${artifact_path_runner_1}"
     assert_contains "search.feature" "${artifact_path_runner_1}"
   done
 }
@@ -68,8 +66,7 @@ load _helper.circleci.bash
 
     assert_contains "homepage.feature" "${tests_data}"
     assert_contains "login.feature" "${tests_data}"
-    # @see https://github.com/drevops/vortex/issues/1461
-    # assert_contains "clamav.feature" "${tests_data}"
+    assert_contains "clamav.feature" "${tests_data}"
     assert_contains "search.feature" "${tests_data}"
   done
 }

.vortex/tests/bats/provision.bats

@@ -133,9 +133,8 @@ assert_provision_info() {
     "@drush -y php:eval \Drupal::service('config.factory')->getEditable('system.site')->set('name', 'YOURSITE')->save();"
     "@drush -y pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect shield stage_file_proxy"
     "@drush -y pm:install redis"
-    # @see https://github.com/drevops/vortex/issues/1461
-    # "@drush -y pm:install clamav"
-    # "@drush -y config-set clamav.settings mode_daemon_tcpip.hostname clamav"
+    "@drush -y pm:install clamav"
+    "@drush -y config-set clamav.settings mode_daemon_tcpip.hostname clamav"
     "@drush -y pm:install search_api search_api_solr"
     "@drush -y pm:install ys_core ys_search"
     "@drush -y deploy:hook"
@@ -254,9 +253,8 @@ assert_provision_info() {
     "@drush -y php:eval \Drupal::service('config.factory')->getEditable('system.site')->set('name', 'YOURSITE')->save();"
     "@drush -y pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect shield stage_file_proxy"
     "@drush -y pm:install redis"
-    # @see https://github.com/drevops/vortex/issues/1461
-    # "@drush -y pm:install clamav"
-    # "@drush -y config-set clamav.settings mode_daemon_tcpip.hostname clamav"
+    "@drush -y pm:install clamav"
+    "@drush -y config-set clamav.settings mode_daemon_tcpip.hostname clamav"
     "@drush -y pm:install search_api search_api_solr"
     "@drush -y pm:install ys_core ys_search"
     "@drush -y deploy:hook"
@@ -384,9 +382,8 @@ assert_provision_info() {
     "@drush -y php:eval \Drupal::service('config.factory')->getEditable('system.site')->set('name', 'YOURSITE')->save();"
     "@drush -y pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect shield stage_file_proxy"
     "@drush -y pm:install redis"
-    # @see https://github.com/drevops/vortex/issues/1461
-    # "@drush -y pm:install clamav"
-    # "@drush -y config-set clamav.settings mode_daemon_tcpip.hostname clamav"
+    "@drush -y pm:install clamav"
+    "@drush -y config-set clamav.settings mode_daemon_tcpip.hostname clamav"
     "@drush -y pm:install search_api search_api_solr"
     "@drush -y pm:install ys_core ys_search"
     "@drush -y deploy:hook"
@@ -518,9 +515,8 @@ assert_provision_info() {
     "@drush -y php:eval \Drupal::service('config.factory')->getEditable('system.site')->set('name', 'YOURSITE')->save();"
     "@drush -y pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect shield stage_file_proxy"
     "@drush -y pm:install redis"
-    # @see https://github.com/drevops/vortex/issues/1461
-    # "@drush -y pm:install clamav"
-    # "@drush -y config-set clamav.settings mode_daemon_tcpip.hostname clamav"
+    "@drush -y pm:install clamav"
+    "@drush -y config-set clamav.settings mode_daemon_tcpip.hostname clamav"
     "@drush -y pm:install search_api search_api_solr"
     "@drush -y pm:install ys_core ys_search"
     "@drush -y deploy:hook"
@@ -648,9 +644,8 @@ assert_provision_info() {
     "@drush -y php:eval \Drupal::service('config.factory')->getEditable('system.site')->set('name', 'YOURSITE')->save();"
     "@drush -y pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect shield stage_file_proxy"
     "@drush -y pm:install redis"
-    # @see https://github.com/drevops/vortex/issues/1461
-    # "@drush -y pm:install clamav"
-    # "@drush -y config-set clamav.settings mode_daemon_tcpip.hostname clamav"
+    "@drush -y pm:install clamav"
+    "@drush -y config-set clamav.settings mode_daemon_tcpip.hostname clamav"
     "@drush -y pm:install search_api search_api_solr"
     "@drush -y pm:install ys_core ys_search"
     "@drush -y deploy:hook"
@@ -772,9 +767,8 @@ assert_provision_info() {
     "@drush -y php:eval \Drupal::service('config.factory')->getEditable('system.site')->set('name', 'YOURSITE')->save();"
     "@drush -y pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect shield stage_file_proxy"
     "@drush -y pm:install redis"
-    # @see https://github.com/drevops/vortex/issues/1461
-    # "@drush -y pm:install clamav"
-    # "@drush -y config-set clamav.settings mode_daemon_tcpip.hostname clamav"
+    "@drush -y pm:install clamav"
+    "@drush -y config-set clamav.settings mode_daemon_tcpip.hostname clamav"
     "@drush -y pm:install search_api search_api_solr"
     "@drush -y pm:install ys_core ys_search"
     "@drush -y deploy:hook"
@@ -903,9 +897,8 @@ assert_provision_info() {
     "@drush -y php:eval \Drupal::service('config.factory')->getEditable('system.site')->set('name', 'YOURSITE')->save();"
     "@drush -y pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect shield stage_file_proxy"
     "@drush -y pm:install redis"
-    # @see https://github.com/drevops/vortex/issues/1461
-    # "@drush -y pm:install clamav"
-    # "@drush -y config-set clamav.settings mode_daemon_tcpip.hostname clamav"
+    "@drush -y pm:install clamav"
+    "@drush -y config-set clamav.settings mode_daemon_tcpip.hostname clamav"
     "@drush -y pm:install search_api search_api_solr"
     "@drush -y pm:install ys_core ys_search"
     "@drush -y deploy:hook"

composer.json

@@ -8,6 +8,7 @@
         "composer/installers": "^2.3",
         "cweagans/composer-patches": "^1.7",
         "drupal/admin_toolbar": "^3.5",
+        "drupal/clamav": "^2.1",
         "drupal/coffee": "^2",
         "drupal/config_split": "^2",
         "drupal/config_update": "^2@alpha",

docker-compose.yml

@@ -155,7 +155,7 @@ services:
       context: .
       dockerfile: .docker/database.dockerfile
       args:
-        IMAGE: "${VORTEX_DB_IMAGE:-uselagoon/mariadb-10.11-drupal:24.12.0}" # Use custom database image (if defined) or fallback to standard database image.
+        IMAGE: "${VORTEX_DB_IMAGE:-uselagoon/mariadb-10.11-drupal:25.1.0}" # Use custom database image (if defined) or fallback to standard database image.
     <<: *default-user
     environment:
       <<: *default-environment
@@ -168,7 +168,7 @@ services:
 
   #;< REDIS
   redis:
-    image: uselagoon/redis-6:24.12.0
+    image: uselagoon/redis-6:25.1.0
     #;< LAGOON
     labels:
       lagoon.type: redis # Change to 'none' if dedicated Redis service is used. See https://docs.lagoon.sh/using-lagoon-advanced/service-types/
@@ -218,7 +218,7 @@ services:
 
   # Chrome container, used for browser testing.
   chrome:
-    image: selenium/standalone-chromium:131.0
+    image: selenium/standalone-chromium:132.0
     ports:
       - "7900" # Find port on host with `docker compose port chrome 7900`.
     shm_size: '1gb' # Increase '/dev/shm' partition size to avoid browser crashing.

scripts/custom/provision-10-example.sh

@@ -38,9 +38,8 @@ if echo "${VORTEX_PROVISION_ENVIRONMENT:-}" | grep -q -e dev -e test -e ci -e lo
   #;> REDIS
 
   #;< CLAMAV
-  # @see https://github.com/drevops/vortex/issues/1461
-  # drush pm:install clamav
-  # drush config-set clamav.settings mode_daemon_tcpip.hostname clamav
+  drush pm:install clamav
+  drush config-set clamav.settings mode_daemon_tcpip.hostname clamav
   #;> CLAMAV
 
   #;< SOLR

tests/behat/features/clamav.feature

@@ -1,4 +1,4 @@
-@clamav @p0 @skipped
+@clamav @p0
 Feature: ClamAV Anti-virus
 
   Ensure that ClamAV is working correctly.