Merge pull request #518 from City-of-Helsinki/update-configuration

Automatic update
City-of-Helsinki · Feb 14, 2023 · ef720bb · ef720bb
2 parents c56a349 + 55ca451
commit ef720bb
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 52 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml
@@ -5,7 +5,6 @@ module:
   address: 0
   admin_toolbar: 0
   admin_toolbar_tools: 0
-  aet: 0
   allowed_formats: 0
   block: 0
   breakpoint: 0
@@ -133,7 +132,6 @@ module:
   telephone: 0
   text: 0
   token: 0
-  token_filter: 0
   toolbar: 0
   translatable_menu_link_uri: 0
   twig_tweak: 0

diff --git a/conf/cmi/filter.format.full_html.yml b/conf/cmi/filter.format.full_html.yml
@@ -7,7 +7,6 @@ dependencies:
     - helfi_api_base
     - linkit
     - media
-    - token_filter
 _core:
   default_config_hash: xpLSr9WoVOW2SAHrxY02hUPmBUOf1TNQMcjZ7UqpfkU
 name: HTML
@@ -88,13 +87,6 @@ filters:
       default_view_mode: default
       allowed_view_modes: {  }
       allowed_media_types: {  }
-  token_filter:
-    id: token_filter
-    provider: token_filter
-    status: true
-    weight: -47
-    settings:
-      replace_empty: '1'
   helfi_link_converter:
     id: helfi_link_converter
     provider: helfi_api_base

diff --git a/conf/cmi/filter.format.minimal.yml b/conf/cmi/filter.format.minimal.yml
@@ -7,7 +7,6 @@ dependencies:
     - helfi_api_base
     - linkit
     - media
-    - token_filter
 name: Minimal
 format: minimal
 weight: 0
@@ -86,13 +85,6 @@ filters:
       default_view_mode: default
       allowed_view_modes: {  }
       allowed_media_types: {  }
-  token_filter:
-    id: token_filter
-    provider: token_filter
-    status: true
-    weight: -43
-    settings:
-      replace_empty: '1'
   helfi_link_converter:
     id: helfi_link_converter
     provider: helfi_api_base

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -52,6 +52,9 @@ services:
   db:
     container_name: "${COMPOSE_PROJECT_NAME}-db"
     image: druidfi/mariadb:10.9-drupal
+    environment:
+      MARIADB_AUTO_UPGRADE: "1"
+      MARIADB_INITDB_SKIP_TZINFO: "1"
     volumes:
       - db_data:/var/lib/mysql
     ports: