From 07a096f13bb9d3ffd8416dce850c48f47385ace8 Mon Sep 17 00:00:00 2001
From: actions-bot <actions-bot@users.noreply.github.com>
Date: Thu, 25 Jan 2024 07:09:10 +0000
Subject: [PATCH] Update configuration

---
 composer.lock                     | 26 +++++++++++++-------------
 conf/cmi/imagemagick.settings.yml |  1 -
 tools/make/docker.mk              |  3 ++-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/composer.lock b/composer.lock
index 2b8c65035..c4cbb308e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4502,16 +4502,16 @@
         },
         {
             "name": "drupal/helfi_tunnistamo",
-            "version": "3.0.3",
+            "version": "3.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo.git",
-                "reference": "95844e13d22af91f3ae4d69f9e55edb63215943a"
+                "reference": "07c25d907de18d26f203463203129bd67608526d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tunnistamo/zipball/95844e13d22af91f3ae4d69f9e55edb63215943a",
-                "reference": "95844e13d22af91f3ae4d69f9e55edb63215943a",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tunnistamo/zipball/07c25d907de18d26f203463203129bd67608526d",
+                "reference": "07c25d907de18d26f203463203129bd67608526d",
                 "shasum": ""
             },
             "require": {
@@ -4528,10 +4528,10 @@
             ],
             "description": "Tunnistamo integration",
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/tree/3.0.3",
+                "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/tree/3.0.4",
                 "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/issues"
             },
-            "time": "2024-01-09T07:24:18+00:00"
+            "time": "2024-01-25T07:06:50+00:00"
         },
         {
             "name": "drupal/image_style_quality",
@@ -4648,17 +4648,17 @@
         },
         {
             "name": "drupal/imagemagick",
-            "version": "3.6.0",
+            "version": "3.7.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/imagemagick.git",
-                "reference": "8.x-3.6"
+                "reference": "8.x-3.7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/imagemagick-8.x-3.6.zip",
-                "reference": "8.x-3.6",
-                "shasum": "b4efc5ff6ab5469475f0ef7242eba0c7eda1c75c"
+                "url": "https://ftp.drupal.org/files/projects/imagemagick-8.x-3.7.zip",
+                "reference": "8.x-3.7",
+                "shasum": "2698db0ccc4a76d44ebbbfcabe9e70d25ae3db9b"
             },
             "require": {
                 "drupal/core": "^10.1",
@@ -4668,8 +4668,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-3.6",
-                    "datestamp": "1703241142",
+                    "version": "8.x-3.7",
+                    "datestamp": "1706096705",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
diff --git a/conf/cmi/imagemagick.settings.yml b/conf/cmi/imagemagick.settings.yml
index 37333701a..e734cd540 100644
--- a/conf/cmi/imagemagick.settings.yml
+++ b/conf/cmi/imagemagick.settings.yml
@@ -6,7 +6,6 @@ path_to_binaries: ''
 prepend: ''
 log_warnings: true
 debug: false
-locale: en_US.UTF-8
 advanced:
   density: 0
   colorspace: '0'
diff --git a/tools/make/docker.mk b/tools/make/docker.mk
index d7271e80f..d48e4f0eb 100644
--- a/tools/make/docker.mk
+++ b/tools/make/docker.mk
@@ -1,5 +1,6 @@
 CLI_SERVICE := app
 CLI_SHELL := sh
+# Note: specification says this file would be compose.yaml
 DOCKER_COMPOSE_YML_PATH ?= docker-compose.yml
 DOCKER_COMPOSE_YML_EXISTS := $(shell test -f $(DOCKER_COMPOSE_YML_PATH) && echo yes || echo no)
 DOCKER_PROJECT_ROOT ?= /app
@@ -75,7 +76,7 @@ endif
 
 ifeq ($(RUN_ON),docker)
 define docker_compose
-	@docker compose$(if $(filter docker-compose.yml,$(DOCKER_COMPOSE_YML_PATH)),, -f $(DOCKER_COMPOSE_YML_PATH)) $(1)
+	@docker compose$(if $(filter $(DOCKER_COMPOSE_YML_PATH),$(DOCKER_COMPOSE_YML_PATH)),, -f $(DOCKER_COMPOSE_YML_PATH)) $(1)
 endef
 else
 define docker_compose