From 0fa37476686ca5d827419e6fb73a91e0d8e6564b Mon Sep 17 00:00:00 2001 From: khalima <1712902+khalima@users.noreply.github.com> Date: Wed, 20 Mar 2024 08:50:52 +0000 Subject: [PATCH] Update configuration --- .platform/schema | 2 +- docker-compose.yml => compose.yaml | 1 - composer.lock | 36 +++++++++++++++++------------- tools/make/docker.mk | 2 +- 4 files changed, 22 insertions(+), 19 deletions(-) rename docker-compose.yml => compose.yaml (98%) diff --git a/.platform/schema b/.platform/schema index 7813681f..62f94575 100644 --- a/.platform/schema +++ b/.platform/schema @@ -1 +1 @@ -5 \ No newline at end of file +6 \ No newline at end of file diff --git a/docker-compose.yml b/compose.yaml similarity index 98% rename from docker-compose.yml rename to compose.yaml index 218211a8..344033c2 100644 --- a/docker-compose.yml +++ b/compose.yaml @@ -27,7 +27,6 @@ services: # Use drush server to run functional tests, so we don't have to care about # permission or SSL issues. 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" diff --git a/composer.lock b/composer.lock index a36a8224..980d165b 100644 --- a/composer.lock +++ b/composer.lock @@ -4007,12 +4007,12 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "75458dd3ea587b7f033a8bf6102d627d1a2abb50" + "reference": "08fe754581afe4ba8d1d7324b193108f476dd548" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/75458dd3ea587b7f033a8bf6102d627d1a2abb50", - "reference": "75458dd3ea587b7f033a8bf6102d627d1a2abb50", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/08fe754581afe4ba8d1d7324b193108f476dd548", + "reference": "08fe754581afe4ba8d1d7324b193108f476dd548", "shasum": "" }, "require": { @@ -4084,7 +4084,7 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2024-03-14T08:10:18+00:00" + "time": "2024-03-20T07:54:25+00:00" }, { "name": "drupal/helfi_navigation", @@ -4122,16 +4122,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.3.24", + "version": "4.3.26", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "1f72903a8401e8e1cb3a32477b405c7b416e44a0" + "reference": "fd977de147c9629190e7c1d413a03d1cd20640c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/1f72903a8401e8e1cb3a32477b405c7b416e44a0", - "reference": "1f72903a8401e8e1cb3a32477b405c7b416e44a0", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/fd977de147c9629190e7c1d413a03d1cd20640c2", + "reference": "fd977de147c9629190e7c1d413a03d1cd20640c2", "shasum": "" }, "require": { @@ -4176,6 +4176,7 @@ "drupal/pathauto": "^1.8", "drupal/publication_date": "^2.0@beta", "drupal/rdf": "^2.0", + "drupal/readonly_field_widget": "^1.0", "drupal/redirect": "^1.6", "drupal/role_delegation": "^1.1", "drupal/scheduler": "^1.3", @@ -4225,6 +4226,9 @@ "[#UHF-885] Helfi-specific customizations to EU Cookie Compliance": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/923b35f699820b544397a35b7696570e101cd02c/patches/eu_cookie_compliance_block_8.x-1.24.patch", "[#UHF-8720] Missing config schema for dependencies (https://www.drupal.org/i/3330024)": "https://www.drupal.org/files/issues/2022-12-28/config_dependencies_schema-3330024-2.patch" }, + "drupal/diff": { + "Revision overview form problem, issue 3390329": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/5100132105528b7047b154787afd6459e5e10e18/patches/revision_overview_form.patch" + }, "drupal/paragraphs": { "https://www.drupal.org/project/paragraphs/issues/2904705#comment-13836790": "https://www.drupal.org/files/issues/2020-09-25/2904705-115.patch", "[#UHF-2059] Enhancements for the Admin UI": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/fdccb32397cc6fa19b4d0077b21a2b18aa6be297/patches/helfi_customizations_for_paragraphs_widget_8.x-1.12.patch" @@ -4243,10 +4247,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.24", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.26", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-03-18T09:48:34+00:00" + "time": "2024-03-20T06:32:01+00:00" }, { "name": "drupal/helfi_proxy", @@ -6985,16 +6989,16 @@ }, { "name": "drush/drush", - "version": "12.4.4", + "version": "12.5.0", "source": { "type": "git", "url": "https://github.com/drush-ops/drush.git", - "reference": "a6585cddae47144413565f3c1cd29debc69f6b41" + "reference": "48dc17e0678e9ac162d4598c9e0a7e9009344ed8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drush-ops/drush/zipball/a6585cddae47144413565f3c1cd29debc69f6b41", - "reference": "a6585cddae47144413565f3c1cd29debc69f6b41", + "url": "https://api.github.com/repos/drush-ops/drush/zipball/48dc17e0678e9ac162d4598c9e0a7e9009344ed8", + "reference": "48dc17e0678e9ac162d4598c9e0a7e9009344ed8", "shasum": "" }, "require": { @@ -7117,7 +7121,7 @@ "issues": "https://github.com/drush-ops/drush/issues", "security": "https://github.com/drush-ops/drush/security/advisories", "slack": "https://drupal.slack.com/messages/C62H9CWQM", - "source": "https://github.com/drush-ops/drush/tree/12.4.4" + "source": "https://github.com/drush-ops/drush/tree/12.5.0" }, "funding": [ { @@ -7125,7 +7129,7 @@ "type": "github" } ], - "time": "2024-03-02T12:14:56+00:00" + "time": "2024-03-18T17:30:17+00:00" }, { "name": "easyrdf/easyrdf", diff --git a/tools/make/docker.mk b/tools/make/docker.mk index d48e4f0e..96e47cbd 100644 --- a/tools/make/docker.mk +++ b/tools/make/docker.mk @@ -1,7 +1,7 @@ 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_PATH ?= compose.yaml DOCKER_COMPOSE_YML_EXISTS := $(shell test -f $(DOCKER_COMPOSE_YML_PATH) && echo yes || echo no) DOCKER_PROJECT_ROOT ?= /app DOCKER_WARNING_INSIDE := You are inside the Docker container!