From a8b7e189c4c3eaa4fb5785f580d683c506999777 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Tue, 30 Jan 2024 07:25:44 +0000 Subject: [PATCH] Update configuration --- composer.lock | 92 +++++++++++++++---------------- conf/cmi/imagemagick.settings.yml | 1 - tools/make/docker.mk | 3 +- 3 files changed, 46 insertions(+), 50 deletions(-) diff --git a/composer.lock b/composer.lock index d584f199..9880e607 100644 --- a/composer.lock +++ b/composer.lock @@ -2655,10 +2655,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" @@ -3198,17 +3194,17 @@ }, { "name": "drupal/external_entities", - "version": "2.0.0-alpha6", + "version": "2.0.0-alpha7", "source": { "type": "git", "url": "https://git.drupalcode.org/project/external_entities.git", - "reference": "8.x-2.0-alpha6" + "reference": "8.x-2.0-alpha7" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/external_entities-8.x-2.0-alpha6.zip", - "reference": "8.x-2.0-alpha6", - "shasum": "3c11cc7ac7a4130131a188f6c6fba33937ca5244" + "url": "https://ftp.drupal.org/files/projects/external_entities-8.x-2.0-alpha7.zip", + "reference": "8.x-2.0-alpha7", + "shasum": "db6b820b0fe60da513d3def6721e14393fc6a2a5" }, "require": { "drupal/core": "^8.8 || ^9 || ^10", @@ -3220,8 +3216,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.0-alpha6", - "datestamp": "1684406076", + "version": "8.x-2.0-alpha7", + "datestamp": "1706524114", "security-coverage": { "status": "not-covered", "message": "Alpha releases are not covered by Drupal security advisories." @@ -3815,16 +3811,16 @@ }, { "name": "drupal/hdbt", - "version": "6.4.4", + "version": "6.4.6", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "9e2324b27d7580c59cf0fc976cf4e6bf2fec2d46" + "reference": "d5386975c98e7e34cf8a6793bdddd544ec961b25" }, "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/d5386975c98e7e34cf8a6793bdddd544ec961b25", + "reference": "d5386975c98e7e34cf8a6793bdddd544ec961b25", "shasum": "" }, "require": { @@ -3842,10 +3838,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.6", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-01-23T08:20:48+00:00" + "time": "2024-01-30T07:23:26+00:00" }, { "name": "drupal/hdbt_admin", @@ -4108,16 +4104,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.3.4", + "version": "4.3.5", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "000848538145792d47f0ade6c32c34d46515b863" + "reference": "9efcc488352654c2c7e1f22924eb3e07346f8f8a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/000848538145792d47f0ade6c32c34d46515b863", - "reference": "000848538145792d47f0ade6c32c34d46515b863", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/9efcc488352654c2c7e1f22924eb3e07346f8f8a", + "reference": "9efcc488352654c2c7e1f22924eb3e07346f8f8a", "shasum": "" }, "require": { @@ -4231,10 +4227,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.4", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.5", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-01-18T08:18:38+00:00" + "time": "2024-01-29T12:50:53+00:00" }, { "name": "drupal/helfi_proxy", @@ -4290,16 +4286,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": { @@ -4325,23 +4321,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": { @@ -4358,10 +4354,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", @@ -4478,17 +4474,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", @@ -4498,8 +4494,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" @@ -8519,16 +8515,16 @@ }, { "name": "league/mime-type-detection", - "version": "1.14.0", + "version": "1.15.0", "source": { "type": "git", "url": "https://github.com/thephpleague/mime-type-detection.git", - "reference": "b6a5854368533df0295c5761a0253656a2e52d9e" + "reference": "ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/b6a5854368533df0295c5761a0253656a2e52d9e", - "reference": "b6a5854368533df0295c5761a0253656a2e52d9e", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301", + "reference": "ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301", "shasum": "" }, "require": { @@ -8559,7 +8555,7 @@ "description": "Mime-type detection for Flysystem", "support": { "issues": "https://github.com/thephpleague/mime-type-detection/issues", - "source": "https://github.com/thephpleague/mime-type-detection/tree/1.14.0" + "source": "https://github.com/thephpleague/mime-type-detection/tree/1.15.0" }, "funding": [ { @@ -8571,7 +8567,7 @@ "type": "tidelift" } ], - "time": "2023-10-17T14:13:20+00:00" + "time": "2024-01-28T23:22:08+00:00" }, { "name": "league/uri", 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