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

Automatic update
City-of-Helsinki · Apr 4, 2023 · 1905a86 · 1905a86
2 parents 1839520 + 7204161
commit 1905a86
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 67 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.entity_form_display.node.news_item.default.yml b/conf/cmi/core.entity_form_display.node.news_item.default.yml
@@ -203,9 +203,9 @@ content:
     third_party_settings: {  }
   simple_sitemap:
     weight: 10
+    region: content
     settings: {  }
     third_party_settings: {  }
-    region: content
   status:
     type: boolean_checkbox
     weight: 14

diff --git a/conf/cmi/core.entity_view_display.media.image.image_content_area.yml b/conf/cmi/core.entity_view_display.media.image.image_content_area.yml
@@ -18,22 +18,22 @@ bundle: image
 mode: image_content_area
 content:
   field_media_image:
+    type: responsive_image
     label: hidden
-    weight: 0
     settings:
       responsive_image_style: image__3_2_content_area
       image_link: ''
     third_party_settings: {  }
-    type: responsive_image
+    weight: 0
     region: content
   field_photographer:
     type: string
-    weight: 1
-    region: content
     label: inline
     settings:
       link_to_entity: false
     third_party_settings: {  }
+    weight: 1
+    region: content
 hidden:
   created: true
   langcode: true

diff --git a/conf/cmi/field.storage.node.field_news_item_links_title.yml b/conf/cmi/field.storage.node.field_news_item_links_title.yml
@@ -12,8 +12,8 @@ entity_type: node
 type: string
 settings:
   max_length: 255
-  is_ascii: false
   case_sensitive: false
+  is_ascii: false
 module: core
 locked: false
 cardinality: 1

diff --git a/conf/cmi/field.storage.node.field_short_title.yml b/conf/cmi/field.storage.node.field_short_title.yml
@@ -12,8 +12,8 @@ entity_type: node
 type: string
 settings:
   max_length: 255
-  is_ascii: false
   case_sensitive: false
+  is_ascii: false
 module: core
 locked: false
 cardinality: 1

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -51,7 +51,7 @@ services:
       - internal
   db:
     container_name: "${COMPOSE_PROJECT_NAME}-db"
-    image: druidfi/mariadb:10.9-drupal
+    image: druidfi/mariadb:10.11-drupal
     environment:
       MARIADB_AUTO_UPGRADE: "1"
       MARIADB_INITDB_SKIP_TZINFO: "1"