Merge tag '1.5.3' into develop

1.5.3
civictheme · Oct 16, 2023 · aae18f6 · aae18f6
2 parents d9c8cb7 + 7ad22ae
commit aae18f6
Show file tree

Hide file tree

Showing 10 changed files with 442 additions and 330 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -72,6 +72,17 @@ aliases:
   # support request with CircleCI to enable this feature.
   - &docker_layer_caching false
 
+  - &renovatebot_repository 'salsadigitalauorg/civictheme_source'
+  # The author details to use for commits made by RenovateBot.
+  - &renovatebot_git_author 'RenovateBot Self Hosted <[email protected]>'
+  # The schedule to run RenovateBot on.
+  - &renovatebot_schedule "5 23 * * *"
+  # Set to 'false' (without single quotes) once the setup is complete and
+  # the bot ran at least once without errors.
+  - &renovatebot_dry_run false
+  # The branch to run RenovateBot on.
+  - &renovatebot_branch develop
+
   #-----------------------------------------------------------------------------
 
   # Shared configuration applied to each job.
@@ -478,6 +489,23 @@ jobs:
       - store_artifacts:
           path: *drevops_test_artifact_dir
 
+  renovatebot_self_hosted:
+    docker:
+      - image: renovate/renovate:36.108.0
+        environment:
+          RENOVATE_PLATFORM: 'github'
+          RENOVATE_AUTODISCOVER: false
+          RENOVATE_DEPENDENCY_DASHBOARD: true
+          RENOVATE_DEPENDENCY_DASHBOARD_TITLE: 'RenovateBot Dependency Dashboard (self-hosted)'
+          RENOVATE_REPOSITORIES: *renovatebot_repository
+          RENOVATE_GIT_AUTHOR: *renovatebot_git_author
+          RENOVATE_DRY_RUN: *renovatebot_dry_run
+          LOG_LEVEL: debug
+    steps:
+      - checkout
+      - run: renovate-config-validator
+      - run: renovate
+
 ################################################################################
 # WORKFLOWS
 ################################################################################
@@ -601,3 +629,14 @@ workflows:
               only: develop
             tags:
               ignore: /.*/
+
+  renovatebot_self_hosted:
+    triggers:
+      - schedule:
+          cron: *renovatebot_schedule
+          filters:
+            branches:
+              only:
+                - *renovatebot_branch
+    jobs:
+      - renovatebot_self_hosted
diff --git a/.docker/Dockerfile.cli b/.docker/Dockerfile.cli
@@ -9,7 +9,7 @@
 #
 # @see https://hub.docker.com/r/uselagoon/php-7.4-cli-drupal/tags
 # @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-cli-drupal
-FROM uselagoon/php-8.1-cli-drupal:23.3.0
+FROM uselagoon/php-8.1-cli-drupal:23.10.0
 
 # Add missing variables.
 # @todo Remove once https://github.com/uselagoon/lagoon/issues/3121 is resolved.

diff --git a/.docker/Dockerfile.cli.onlytheme b/.docker/Dockerfile.cli.onlytheme
@@ -8,7 +8,7 @@
 #
 # @see https://hub.docker.com/r/uselagoon/php-7.4-cli-drupal/tags
 # @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-cli-drupal
-FROM uselagoon/php-8.1-cli-drupal:23.3.0
+FROM uselagoon/php-8.1-cli-drupal:23.10.0
 
 # Add missing variables.
 # @todo Remove once https://github.com/uselagoon/lagoon/issues/3121 is resolved.

diff --git a/.docker/Dockerfile.cli.sibling b/.docker/Dockerfile.cli.sibling
@@ -9,7 +9,7 @@
 #
 # @see https://hub.docker.com/r/uselagoon/php-7.4-cli-drupal/tags
 # @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-cli-drupal
-FROM uselagoon/php-8.1-cli-drupal:23.3.0
+FROM uselagoon/php-8.1-cli-drupal:23.10.0
 
 # Add missing variables.
 # @todo Remove once https://github.com/uselagoon/lagoon/issues/3121 is resolved.

diff --git a/.docker/Dockerfile.mariadb b/.docker/Dockerfile.mariadb
@@ -8,7 +8,7 @@
 # @see https://github.com/drevops/mariadb-drupal-data
 ARG IMAGE
 
-FROM ${IMAGE:-uselagoon/mariadb-drupal:23.3.0}
+FROM ${IMAGE:-uselagoon/mariadb-drupal:23.10.0}
 
 USER root
 COPY ./.docker/config/mariadb/my.cnf /etc/my.cnf.d/server.cnf

diff --git a/.docker/Dockerfile.nginx-drupal b/.docker/Dockerfile.nginx-drupal
@@ -6,7 +6,7 @@ FROM ${CLI_IMAGE:-cli} as cli
 
 # @see https://hub.docker.com/r/uselagoon/nginx-drupal/tags?page=1
 # @see https://github.com/uselagoon/lagoon-images/tree/main/images/nginx-drupal
-FROM uselagoon/nginx-drupal:23.3.0
+FROM uselagoon/nginx-drupal:23.10.0
 
 COPY ./.docker/config/nginx/. /etc/nginx/conf.d/
 RUN fix-permissions /etc/nginx

diff --git a/.docker/Dockerfile.php b/.docker/Dockerfile.php
@@ -7,6 +7,6 @@
 
 # @see https://hub.docker.com/r/uselagoon/php-7.4-fpm/tags
 # @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-fpm
-FROM uselagoon/php-8.1-fpm:23.3.0
+FROM uselagoon/php-8.1-fpm:23.10.0
 
 COPY --from=cli /app /app