From 690927a1033532bef7456fc38d9511583bf256cf Mon Sep 17 00:00:00 2001 From: actions-bot Date: Fri, 26 Jan 2024 09:25:42 +0000 Subject: [PATCH] Update configuration --- composer.lock | 54 ++++++++++++++----------------- conf/cmi/imagemagick.settings.yml | 1 - tools/make/docker.mk | 3 +- 3 files changed, 27 insertions(+), 31 deletions(-) diff --git a/composer.lock b/composer.lock index 8a89869c..70559800 100644 --- a/composer.lock +++ b/composer.lock @@ -2590,10 +2590,6 @@ "homepage": "https://www.drupal.org/u/greg-boggs", "role": "Maintainer" }, - { - "name": "Greg Boggs", - "homepage": "https://www.drupal.org/user/153069" - }, { "name": "hmartens", "homepage": "https://www.drupal.org/user/622826" @@ -3750,16 +3746,16 @@ }, { "name": "drupal/hdbt", - "version": "6.4.4", + "version": "6.4.5", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "9e2324b27d7580c59cf0fc976cf4e6bf2fec2d46" + "reference": "1728bc4ce9cbb7284f0a7e99617b69242c541345" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/9e2324b27d7580c59cf0fc976cf4e6bf2fec2d46", - "reference": "9e2324b27d7580c59cf0fc976cf4e6bf2fec2d46", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/1728bc4ce9cbb7284f0a7e99617b69242c541345", + "reference": "1728bc4ce9cbb7284f0a7e99617b69242c541345", "shasum": "" }, "require": { @@ -3777,10 +3773,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.4.4", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.4.5", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-01-23T08:20:48+00:00" + "time": "2024-01-26T09:23:39+00:00" }, { "name": "drupal/hdbt_admin", @@ -4225,16 +4221,16 @@ }, { "name": "drupal/helfi_tpr", - "version": "2.3.4", + "version": "2.3.5", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr.git", - "reference": "2847282524718049218005a96bab1938dd760aef" + "reference": "c14c8634c913125faf96d217d11bac4a456049a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/2847282524718049218005a96bab1938dd760aef", - "reference": "2847282524718049218005a96bab1938dd760aef", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/c14c8634c913125faf96d217d11bac4a456049a8", + "reference": "c14c8634c913125faf96d217d11bac4a456049a8", "shasum": "" }, "require": { @@ -4260,23 +4256,23 @@ ], "description": "TPR integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.3.4", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.3.5", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/issues" }, - "time": "2024-01-16T13:52:58+00:00" + "time": "2024-01-26T07:55:57+00:00" }, { "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": { @@ -4293,10 +4289,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", @@ -4413,17 +4409,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", @@ -4433,8 +4429,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 37333701..e734cd54 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 d7271e80..d48e4f0e 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