Merge branch 'release/25.6.0'

Author: AlexSkrypnyk

.ahoy.yml

@@ -105,11 +105,11 @@ commands:
     usage: Run Drush commands in the CLI service container.
     cmd: ahoy cli "vendor/bin/drush -l \${VORTEX_LOCALDEV_URL} $*"
 
-  #;< SERVICE_REDIS
-  flush-redis:
-    usage: Flush Redis cache.
-    cmd: docker compose exec redis redis-cli flushall
-  #;> SERVICE_REDIS
+  #;< SERVICE_VALKEY
+  flush-valkey:
+    usage: Flush Valkey cache.
+    cmd: docker compose exec valkey valkey-cli flushall
+  #;> SERVICE_VALKEY
 
   # ----------------------------------------------------------------------------
   # Application commands.
@@ -146,6 +146,10 @@ commands:
     usage: Export database dump or database image (if VORTEX_DB_IMAGE variable is set).
     cmd: ./scripts/vortex/export-db.sh "$@"
 
+  import-db:
+    usage: Import database from dump.
+    cmd: VORTEX_PROVISION_POST_OPERATIONS_SKIP=1 VORTEX_PROVISION_DB="$@" ahoy cli ./scripts/vortex/provision.sh
+
   pull-db:
     usage: Download database image with the latest nightly dump. Run "ahoy reload-db" to reload DB in the running stack.
     cmd: \[ -n "${VORTEX_DB_IMAGE}" \] && docker pull ${VORTEX_DB_IMAGE} || true
@@ -193,7 +197,7 @@ commands:
     usage: Lint front-end code.
     cmd: |
       ahoy cli vendor/bin/twig-cs-fixer lint
-      ahoy cli "npm run --prefix \${WEBROOT}/themes/custom/\${DRUPAL_THEME} lint"
+      ahoy cli "yarn run --cwd=\${WEBROOT}/themes/custom/\${DRUPAL_THEME} lint"
   #;> DRUPAL_THEME
 
   lint-tests:
@@ -216,7 +220,7 @@ commands:
     usage: Fix lint issues of front-end code.
     cmd: |
       ahoy cli vendor/bin/twig-cs-fixer lint --fix
-      ahoy cli "npm run --prefix \${WEBROOT}/themes/custom/\${DRUPAL_THEME} lint-fix"
+      ahoy cli "yarn run --cwd=\${WEBROOT}/themes/custom/\${DRUPAL_THEME} lint-fix"
   #;> DRUPAL_THEME
 
   test:
@@ -279,7 +283,7 @@ commands:
       fi
     hide: true
 
-# Override entrypoint to alter default behaviour of Ahoy.
+# Override entrypoint to alter default behavior of Ahoy.
 entrypoint:
   - bash
   - -c

.circleci/config.yml

@@ -28,22 +28,6 @@ aliases:
   - &nightly_db_schedule "0 18 * * *"
   #;> !PROVISION_TYPE_PROFILE
 
-  #;< DEPS_UPDATE_PROVIDER_CI
-  # Specify the correct repository to prevent the bot from accessing all
-  # repositories available via $RENOVATE_TOKEN.
-  #;< VORTEX_DEV
-  - &renovatebot_repository 'drevops/vortex-destination'
-  #;> VORTEX_DEV
-  ##### - &renovatebot_repository 'your_org/your_site'
-  # The author details to use for commits made by RenovateBot.
-  #;< VORTEX_DEV
-  - &renovatebot_git_author 'Renovate Self Hosted <deployer+renovatebot@drevops.com>'
-  #;> VORTEX_DEV
-  ##### - &renovatebot_git_author 'RenovateBot Self Hosted <renovatebot@your-site-domain.example>'
-  # The schedule to run RenovateBot on. Defaults to running twice a day.
-  - &renovatebot_schedule "5 11,23 * * *"
-  #;> DEPS_UPDATE_PROVIDER_CI
-
   # Shared runner container configuration applied to each job.
   - &runner_config
     working_directory: &working_directory ~/project
@@ -57,14 +41,14 @@ aliases:
       # This container has all the necessary tools to run a dockerized environment.
       # https://github.com/drevops/ci-runner
       # https://hub.docker.com/repository/docker/drevops/ci-runner/tags
-      - image: drevops/ci-runner:25.3.0
+      - image: drevops/ci-runner:25.5.0
         auth:
           username: ${VORTEX_CONTAINER_REGISTRY_USER}
           password: ${VORTEX_CONTAINER_REGISTRY_PASS}
         environment:
           # Set runner timezone to ensure that executed operations use correct timestamps.
           # https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
-          TZ: "Australia/Melbourne"
+          TZ: "UTC"
           # Set runner terminal capabilities.
           TERM: xterm-256color
           # Disable strict host key checking for SSH connections.
@@ -85,10 +69,8 @@ aliases:
           VORTEX_CI_TEST_RESULTS: &test_results /tmp/tests
           # Directory to store test artifacts.
           VORTEX_CI_ARTIFACTS: &artifacts /tmp/artifacts
-          # Directory to store code exported between jobs.
-          VORTEX_EXPORT_CODE_DIR: &vortex_build_export_dir /tmp/workspace/code
           # Directory to use for artifact deployments.
-          VORTEX_DEPLOY_ARTIFACT_SRC: *vortex_build_export_dir
+          VORTEX_DEPLOY_ARTIFACT_SRC: /tmp/workspace/code
           # Source code location for artifact deployments.
           VORTEX_DEPLOY_ARTIFACT_ROOT: *working_directory
           # Report file location for artifact deployments.
@@ -117,6 +99,16 @@ aliases:
         find . -name "docker-compose.yml" -print0 | xargs -0 -I {} sh -c "sed -i -e ''/###/d'' {} && sed -i -e ''s/##//'' {}"
         mkdir -p /tmp/workspace/code
 
+
+################################################################################
+# PARAMETERS
+################################################################################
+
+parameters:
+  run_update_dependencies:
+    type: boolean
+    default: false
+
 ################################################################################
 # JOBS
 ################################################################################
@@ -158,10 +150,10 @@ jobs:
             # Change 'v1' to 'v2', 'v3' etc., commit and push to force cache reset.
             # Lookup cache based on the default branch and a timestamp. Allows
             # to use cache from the very first build on the day (sanitized database dump, for example).
-            - v25.3.0-db11-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback" }}-{{ checksum "/tmp/db_cache_timestamp" }}
+            - v25.5.0-db11-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback" }}-{{ checksum "/tmp/db_cache_timestamp" }}
             # Fallback to caching by default branch name only. Allows to use
             # cache from the branch build on the previous day.
-            - v25.3.0-db11-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback" }}-
+            - v25.5.0-db11-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback" }}-
 
       - run:
           name: Download DB
@@ -191,7 +183,7 @@ jobs:
           # The cache will not be saved if it already exists.
           # Note that the cache fallback flag is enabled for this case in order
           # to save cache even if the fallback is not used when restoring it.
-          key: v25.3.0-db11-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback_yes" }}-{{ checksum "/tmp/db_cache_timestamp" }}
+          key: v25.5.0-db11-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback_yes" }}-{{ checksum "/tmp/db_cache_timestamp" }}
           paths:
             - /root/project/.data
 
@@ -237,8 +229,8 @@ jobs:
           keys:
             # Use cached artifacts from previous builds of this branch.
             # https://circleci.com/docs/2.0/caching/#restoring-cache
-            - v25.3.0-db11-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback_yes" }}-{{ checksum "/tmp/db_cache_timestamp" }}
-            - v25.3.0-db11-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback_yes" }}-
+            - v25.5.0-db11-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback_yes" }}-{{ checksum "/tmp/db_cache_timestamp" }}
+            - v25.5.0-db11-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback_yes" }}-
       #;> !PROVISION_TYPE_PROFILE
 
       - *step_setup_remote_docker
@@ -261,8 +253,9 @@ jobs:
       - run:
           name: Export built codebase
           command: |
-            mkdir -p "${VORTEX_EXPORT_CODE_DIR}"
-            docker compose cp -L cli:"/app/." "${VORTEX_EXPORT_CODE_DIR}"
+            mkdir -p "/tmp/workspace/code"
+            docker compose cp -L cli:"/app/." "/tmp/workspace/code"
+            du -sh "/tmp/workspace/code"
 
       - run:
           name: Install development dependencies
@@ -373,6 +366,7 @@ jobs:
       - *step_process_codebase_for_ci
 
       - run:
+          name: Deploy
           command: |
             VORTEX_DEPLOY_BRANCH="${CIRCLE_BRANCH}" \
             VORTEX_DEPLOY_PR="$(echo ${CIRCLE_PULL_REQUEST} | cut -d'/' -f 7)" \
@@ -398,6 +392,7 @@ jobs:
       - *step_process_codebase_for_ci
 
       - run:
+          name: Deploy
           command: VORTEX_DEPLOY_MODE="tag" ./scripts/vortex/deploy.sh
           no_output_timeout: 30m
 
@@ -407,22 +402,49 @@ jobs:
 
   #;< DEPS_UPDATE_PROVIDER_CI
   # Self-hosted dependency updates.
-  # Add RENOVATE_TOKEN as an environment variable with GitHub access token in UI.
-  deps-updates:
+  # Add the following environment variables to the CircleCI project:
+  # - RENOVATE_TOKEN: GitHub access token.
+  # - RENOVATE_REPOSITORIES: Repository to run Renovate on as `vendor/repository`.
+  # - RENOVATE_GIT_AUTHOR: Author for Renovate commits as `Name <email@example.com>`.
+  # Variables provided below can be overridden in the CircleCI project settings.
+  update-dependencies:
     docker:
-      - image: renovate/renovate:38.55.2
+      - image: renovate/renovate:40.36.8
         environment:
           RENOVATE_PLATFORM: 'github'
           RENOVATE_AUTODISCOVER: false
-          RENOVATE_DEPENDENCY_DASHBOARD_TITLE: 'RenovateBot Dependency Dashboard (self-hosted)'
+          RENOVATE_DEPENDENCY_DASHBOARD_TITLE: 'Renovate Dependency Dashboard (self-hosted) by CircleCI'
           RENOVATE_DEPENDENCY_DASHBOARD: false
           RENOVATE_DRY_RUN: false
-          RENOVATE_REPOSITORIES: *renovatebot_repository
-          RENOVATE_GIT_AUTHOR: *renovatebot_git_author
+          LOG_LEVEL: 'debug'
+
     steps:
       - checkout
-      - run: renovate-config-validator
-      - run: renovate
+      - run:
+          name: Check if RENOVATE_TOKEN is set
+          command: |
+            if [ -z "${RENOVATE_TOKEN}" ]; then
+              echo "RENOVATE_TOKEN is not set. Skipping job."
+              circleci-agent step halt
+            fi
+
+            if [ -z "${RENOVATE_REPOSITORIES}" ]; then
+              echo "Renovate repository is not set. Skipping job."
+              circleci-agent step halt
+            fi
+
+            if [ -z "${RENOVATE_GIT_AUTHOR}" ]; then
+              echo "Renovate git author is not set. Skipping job."
+              circleci-agent step halt
+            fi
+
+      - run:
+          name: Validate Renovate configuration
+          command: renovate-config-validator
+
+      - run:
+          name: Run Renovate
+          command: renovate
   #;> DEPS_UPDATE_PROVIDER_CI
 
   #;============================================================================
@@ -443,7 +465,7 @@ jobs:
 
       - run:
           name: Run CircleCI tests (long)
-          command: VORTEX_DEV_VOLUMES_MOUNTED=0 VORTEX_DEV_TEST_COVERAGE_DIR=/tmp/artifacts/coverage .vortex/tests/test.postbuild.sh
+          command: VORTEX_DEV_VOLUMES_SKIP_MOUNT=1 VORTEX_DEV_TEST_COVERAGE_DIR=/tmp/artifacts/coverage .vortex/tests/test.postbuild.sh
 
       - store_test_results:
           path: *test_results
@@ -645,15 +667,20 @@ workflows:
   #;> !PROVISION_TYPE_PROFILE
 
   #;< DEPS_UPDATE_PROVIDER_CI
-  # Self-hosted Renovatebot workflow.
-  deps-updates:
+  # Self-hosted Renovate workflow.
+  update-dependencies:
     triggers:
       - schedule:
-          cron: *renovatebot_schedule
+          cron: "5 11,23 * * *"
           filters:
             branches:
               only:
                 - develop
     jobs:
-      - deps-updates
+      - update-dependencies
+
+  update-dependencies-manual:
+    when: << pipeline.parameters.run_update_dependencies >>
+    jobs:
+      - update-dependencies
   #;> DEPS_UPDATE_PROVIDER_CI

.docker/clamav.dockerfile

@@ -10,7 +10,7 @@
 # @see https://hub.docker.com/r/uselagoon/commons/tags
 # @see https://github.com/uselagoon/lagoon-images/tree/main/images/commons
 
-FROM uselagoon/commons:25.4.0 AS commons
+FROM uselagoon/commons:25.5.0 AS commons
 
 FROM clamav/clamav:1.4.2
 

.docker/cli.dockerfile

@@ -7,7 +7,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:25.4.0
+FROM uselagoon/php-8.3-cli-drupal:25.5.0
 
 # Add missing variables.
 # @todo Remove once https://github.com/uselagoon/lagoon/issues/3121 is resolved.
@@ -22,22 +22,19 @@ ENV WEBROOT=${WEBROOT}
 ARG GITHUB_TOKEN=""
 ENV GITHUB_TOKEN=${GITHUB_TOKEN}
 
-#;< DRUPAL_THEME
-ARG DRUPAL_THEME="your_site_theme"
-ENV DRUPAL_THEME=${DRUPAL_THEME}
-#;> DRUPAL_THEME
-
-ARG DRUPAL_PUBLIC_FILES="/app/${WEBROOT}/sites/default/files"
+ARG DRUPAL_PUBLIC_FILES="sites/default/files"
 ENV DRUPAL_PUBLIC_FILES=${DRUPAL_PUBLIC_FILES}
 
-ARG DRUPAL_PRIVATE_FILES="/app/${WEBROOT}/sites/default/files/private"
+ARG DRUPAL_PRIVATE_FILES="sites/default/files/private"
 ENV DRUPAL_PRIVATE_FILES=${DRUPAL_PRIVATE_FILES}
 
 ARG DRUPAL_TEMPORARY_FILES="${TMP:-/tmp}"
 ENV DRUPAL_TEMPORARY_FILES=${DRUPAL_TEMPORARY_FILES}
 
-ARG DRUPAL_CONFIG_PATH="/app/config/default"
-ENV DRUPAL_CONFIG_PATH=${DRUPAL_CONFIG_PATH}
+#;< DRUPAL_THEME
+ARG DRUPAL_THEME="your_site_theme"
+ENV DRUPAL_THEME=${DRUPAL_THEME}
+#;> DRUPAL_THEME
 
 ENV COMPOSER_ALLOW_SUPERUSER=1 \
     COMPOSER_CACHE_DIR=/tmp/.composer/cache \
@@ -55,6 +52,7 @@ ENV COMPOSER_ALLOW_SUPERUSER=1 \
 RUN apk add --no-cache ncurses pv tzdata autoconf g++ make \
   && pecl install pcov \
   && docker-php-ext-enable pcov \
+  && docker-php-ext-install pcntl \
   && apk del g++ make autoconf
 
 # Add patches and scripts.
@@ -98,8 +96,8 @@ RUN yarn --cwd=/app/${WEBROOT}/themes/custom/${DRUPAL_THEME} install --frozen-lo
 COPY . /app
 
 # Create file directories and set correct permissions.
-RUN mkdir -p "${DRUPAL_PUBLIC_FILES}" "${DRUPAL_PRIVATE_FILES}" "${DRUPAL_TEMPORARY_FILES}" "${DRUPAL_CONFIG_PATH}" && \
- chmod 0770 "${DRUPAL_PUBLIC_FILES}" "${DRUPAL_PRIVATE_FILES}" "${DRUPAL_TEMPORARY_FILES}" "${DRUPAL_CONFIG_PATH}"
+RUN mkdir -p "/app/${WEBROOT}/${DRUPAL_PUBLIC_FILES}" "/app/${WEBROOT}/${DRUPAL_PRIVATE_FILES}" "${DRUPAL_TEMPORARY_FILES}" && \
+ chmod 0770 "/app/${WEBROOT}/${DRUPAL_PUBLIC_FILES}" "/app/${WEBROOT}/${DRUPAL_PRIVATE_FILES}" "${DRUPAL_TEMPORARY_FILES}"
 
 #;< DRUPAL_THEME
 # Compile front-end assets. This runs after copying all files, as source files

.docker/database.dockerfile

@@ -5,7 +5,7 @@
 #
 # The ARG value will be updated with a value passed from docker-compose.yml
 
-ARG IMAGE=uselagoon/mysql-8.4:25.4.0
+ARG IMAGE=uselagoon/mysql-8.4:25.5.0
 # hadolint ignore=DL3006
 FROM ${IMAGE}
 

.docker/nginx-drupal.dockerfile

@@ -11,7 +11,7 @@ ARG CLI_IMAGE
 # hadolint ignore=DL3006
 FROM ${CLI_IMAGE:-cli} AS cli
 
-FROM uselagoon/nginx-drupal:25.4.0
+FROM uselagoon/nginx-drupal:25.5.0
 
 # Webroot is used for Nginx web root configuration.
 ARG WEBROOT=web

.docker/php.dockerfile

@@ -12,7 +12,7 @@ ARG CLI_IMAGE
 # hadolint ignore=DL3006
 FROM ${CLI_IMAGE:-cli} AS cli
 
-FROM uselagoon/php-8.3-fpm:25.4.0
+FROM uselagoon/php-8.3-fpm:25.5.0
 
 RUN apk add --no-cache tzdata
 

.docker/solr.dockerfile

@@ -9,7 +9,7 @@ ARG CLI_IMAGE
 # hadolint ignore=DL3006
 FROM ${CLI_IMAGE:-cli} AS cli
 
-FROM uselagoon/solr-8:25.4.0
+FROM uselagoon/solr-8:25.5.0
 
 # Solr jump-start config needs to be manually copied from the search_api_solr
 # Drupal module to .docker/config/solr/config-set.