Merge pull request #1151 from City-of-Helsinki/dev

Dev to main

Author: hyrsky

.env

@@ -18,9 +18,6 @@ DRUPAL_HOSTNAME=helfi-kymp.docker.so
 STAGE_FILE_PROXY_ORIGIN=https://stplattaprod.blob.core.windows.net
 STAGE_FILE_PROXY_ORIGIN_DIR=liikenneprod
 
-# Docker image
-DRUPAL_IMAGE=ghcr.io/city-of-helsinki/drupal-web:8.3
-
 # Public webroot
 DRUPAL_WEBROOT=public
 

compose.yaml

@@ -1,7 +1,7 @@
 services:
   app:
     container_name: "${COMPOSE_PROJECT_NAME}-app"
-    image: "${DRUPAL_IMAGE}"
+    image: "${DRUPAL_IMAGE:-ghcr.io/city-of-helsinki/drupal-web:8.4}"
     hostname: "${COMPOSE_PROJECT_NAME}"
     volumes:
       - .:/app:delegated
@@ -118,7 +118,7 @@ services:
     profiles:
       - search
   elastic:
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.18.2
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.19.3
     container_name: "${COMPOSE_PROJECT_NAME}-elastic"
     environment:
       - node.name="${COMPOSE_PROJECT_NAME}-elastic"

composer.json

@@ -39,12 +39,13 @@
         "optimize-autoloader": true,
         "sort-packages": true,
         "allow-plugins": {
-            "dealerdirect/phpcodesniffer-composer-installer": true,
             "composer/installers": true,
             "cweagans/composer-patches": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true,
             "drupal/core-composer-scaffold": true,
             "php-http/discovery": false,
-            "phpstan/extension-installer": true
+            "phpstan/extension-installer": true,
+            "tbachert/spi": false
         },
         "audit": {
             "abandoned": "report",

composer.lock

@@ -23,4 +23,5 @@ content:
       placeholder: ''
     third_party_settings: {  }
 hidden:
+  langcode: true
   tid: true

conf/cmi/core.entity_form_display.helfi_news_groups.helfi_news_groups.default.yml

@@ -23,4 +23,5 @@ content:
       placeholder: ''
     third_party_settings: {  }
 hidden:
+  langcode: true
   tid: true

conf/cmi/core.entity_form_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml

@@ -23,4 +23,5 @@ content:
       placeholder: ''
     third_party_settings: {  }
 hidden:
+  langcode: true
   tid: true

conf/cmi/core.entity_form_display.helfi_news_tags.helfi_news_tags.default.yml

@@ -6,13 +6,23 @@ dependencies:
     - core.entity_form_mode.media.media_library
     - field.field.media.hel_map.field_media_hel_map
     - media.type.hel_map
+  module:
+    - link
 _core:
-  default_config_hash: V2n3czOuzjECna58BNEbj6OsF5vbf8YqdjW6YmZABJU
+  default_config_hash: mB1qn09Anlv4NN5drGy-3Yp6eCU79CFve-VfKP_f7ag
 id: media.hel_map.media_library
 targetEntityType: media
 bundle: hel_map
 mode: media_library
 content:
+  field_media_hel_map:
+    type: link_default
+    weight: 1
+    region: content
+    settings:
+      placeholder_url: ''
+      placeholder_title: ''
+    third_party_settings: {  }
   name:
     type: string_textfield
     weight: 0
@@ -23,7 +33,6 @@ content:
     third_party_settings: {  }
 hidden:
   created: true
-  field_media_hel_map: true
   langcode: true
   path: true
   status: true

conf/cmi/core.entity_form_display.media.hel_map.media_library.yml

@@ -25,11 +25,13 @@ content:
 hidden:
   groups: true
   groups_uuid: true
+  langcode: true
   neighbourhoods: true
   neighbourhoods_uuid: true
   node_url: true
   published_at: true
   search_api_excerpt: true
+  search_api_language: true
   short_title: true
   tags: true
   tags_uuid: true

conf/cmi/core.entity_view_display.helfi_news.helfi_news.default.yml

@@ -27,11 +27,13 @@ content:
 hidden:
   groups: true
   groups_uuid: true
+  langcode: true
   neighbourhoods: true
   neighbourhoods_uuid: true
   node_url: true
   published_at: true
   search_api_excerpt: true
+  search_api_language: true
   short_title: true
   tags: true
   tags_uuid: true