Update configuration

City-of-Helsinki · Feb 15, 2023 · 3caea82 · 3caea82
1 parent 8731117
commit 3caea82
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 57 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml
@@ -136,7 +136,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: sT1EGRgQu01VxKkqehd1pxPfnzNMU02el719MOliiho
 name: HTML
@@ -49,13 +48,6 @@ filters:
     weight: -48
     settings:
       title: true
-  token_filter:
-    id: token_filter
-    provider: token_filter
-    status: true
-    weight: -47
-    settings:
-      replace_empty: '1'
   media_embed:
     id: media_embed
     provider: media

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
 _core:
   default_config_hash: rPfSn6HhVRcP1eR3cJR8Dn5fcv2gnRaSGuABkDE6mE0
 name: Minimal
@@ -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: -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: