From 847152a2429364e104b961b0037de6fb579bb0e3 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Fri, 22 Dec 2023 10:45:49 +0000 Subject: [PATCH] Update configuration --- .platform/schema | 2 +- composer.json | 3 +++ composer.lock | 46 +++++++++++++++++++++++----------------------- docker-compose.yml | 1 + 4 files changed, 28 insertions(+), 24 deletions(-) diff --git a/.platform/schema b/.platform/schema index bf0d87ab..7813681f 100644 --- a/.platform/schema +++ b/.platform/schema @@ -1 +1 @@ -4 \ No newline at end of file +5 \ No newline at end of file diff --git a/composer.json b/composer.json index c4007354..9bbc6348 100644 --- a/composer.json +++ b/composer.json @@ -98,6 +98,9 @@ "drush/Commands/{$name}": [ "type:drupal-drush" ] + }, + "patchLevel": { + "drupal/core": "-p2" } }, "repositories": [ diff --git a/composer.lock b/composer.lock index 2fa41dca..d6c2eb0f 100644 --- a/composer.lock +++ b/composer.lock @@ -3747,16 +3747,16 @@ }, { "name": "drupal/hdbt", - "version": "6.2.3", + "version": "6.2.6", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "42da48940898bba23b0099d48ecc312b7af753b3" + "reference": "d7e0aa82feff4c6faae4e39e9a36e5381ce5ca77" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/42da48940898bba23b0099d48ecc312b7af753b3", - "reference": "42da48940898bba23b0099d48ecc312b7af753b3", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/d7e0aa82feff4c6faae4e39e9a36e5381ce5ca77", + "reference": "d7e0aa82feff4c6faae4e39e9a36e5381ce5ca77", "shasum": "" }, "require": { @@ -3774,10 +3774,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.2.3", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.2.6", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-12-21T06:46:53+00:00" + "time": "2023-12-22T10:43:12+00:00" }, { "name": "drupal/hdbt_admin", @@ -3954,12 +3954,12 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "218297db1a13ae4dbae519ce5f81bf64277fe36d" + "reference": "fd2a0ddaaf03a12a2670f4d5b2c71b857bae08e7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/218297db1a13ae4dbae519ce5f81bf64277fe36d", - "reference": "218297db1a13ae4dbae519ce5f81bf64277fe36d", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/fd2a0ddaaf03a12a2670f4d5b2c71b857bae08e7", + "reference": "fd2a0ddaaf03a12a2670f4d5b2c71b857bae08e7", "shasum": "" }, "require": { @@ -4001,7 +4001,7 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2023-11-30T13:43:09+00:00" + "time": "2023-12-22T10:17:34+00:00" }, { "name": "drupal/helfi_navigation", @@ -4170,16 +4170,16 @@ }, { "name": "drupal/helfi_proxy", - "version": "3.1.1", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy.git", - "reference": "b14b5fc48eb3df0c88b2e77176561c94402674bf" + "reference": "cab652f056b9a8d8e9e435a758403408cb752c60" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/b14b5fc48eb3df0c88b2e77176561c94402674bf", - "reference": "b14b5fc48eb3df0c88b2e77176561c94402674bf", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/cab652f056b9a8d8e9e435a758403408cb752c60", + "reference": "cab652f056b9a8d8e9e435a758403408cb752c60", "shasum": "" }, "require": { @@ -4215,10 +4215,10 @@ ], "description": "Provides various fixes so we can serve multiple Drupal instances in one domain.", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/tree/3.1.1", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/tree/3.2.0", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/issues" }, - "time": "2023-11-07T08:55:52+00:00" + "time": "2023-12-21T07:53:51+00:00" }, { "name": "drupal/helfi_tpr", @@ -4264,16 +4264,16 @@ }, { "name": "drupal/helfi_tunnistamo", - "version": "3.0.1", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo.git", - "reference": "a866ceb3c42f72bef8c2ae9878b24490f257607c" + "reference": "9e53539beaf01023ee23783560fb5b4c2f958ba5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tunnistamo/zipball/a866ceb3c42f72bef8c2ae9878b24490f257607c", - "reference": "a866ceb3c42f72bef8c2ae9878b24490f257607c", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tunnistamo/zipball/9e53539beaf01023ee23783560fb5b4c2f958ba5", + "reference": "9e53539beaf01023ee23783560fb5b4c2f958ba5", "shasum": "" }, "require": { @@ -4290,10 +4290,10 @@ ], "description": "Tunnistamo integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/tree/3.0.1", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/tree/3.0.2", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/issues" }, - "time": "2023-12-20T09:14:52+00:00" + "time": "2023-12-21T07:28:26+00:00" }, { "name": "drupal/image_style_quality", @@ -4431,7 +4431,7 @@ "extra": { "drupal": { "version": "8.x-3.6", - "datestamp": "1703095475", + "datestamp": "1703241142", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" diff --git a/docker-compose.yml b/docker-compose.yml index 941446d7..9318a816 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,6 +29,7 @@ services: SIMPLETEST_BASE_URL: "http://app:8888" SIMPLETEST_DB: "mysql://drupal:drupal@db:3306/drupal" BROWSERTEST_OUTPUT_BASE_URL: "https://${DRUPAL_HOSTNAME}" + BROWSERTEST_OUTPUT_DIRECTORY: "/app/public/sites/default/files/simpletest" DRUPAL_VARNISH_HOST: "${COMPOSE_PROJECT_NAME}-varnish" DRUPAL_VARNISH_PORT: 6081 REDIS_HOST: redis