Update configuration

City-of-Helsinki · Jan 23, 2023 · 23c8f45 · 23c8f45
1 parent 89afebe
commit 23c8f45
Show file tree

Hide file tree

Showing 8 changed files with 179 additions and 117 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml
@@ -43,6 +43,7 @@ module:
   hdbt_admin_tools: 0
   hdbt_component_library: 0
   hdbt_content: 0
+  health_check: 0
   helfi_announcements: 0
   helfi_announcements_tpr: 0
   helfi_api_base: 0

diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news.yml b/conf/cmi/external_entities.external_entity_type.helfi_news.yml
@@ -35,7 +35,7 @@ field_mapper_config:
       value: '$.attributes[''short_title'']'
 storage_client_id: helfi_news
 storage_client_config: {  }
-persistent_cache_max_age: -1
+persistent_cache_max_age: 10800
 annotation_entity_type_id: null
 annotation_bundle_id: null
 annotation_field_name: null

diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml
@@ -20,7 +20,7 @@ field_mapper_config:
       value: '$.attributes["name"]'
 storage_client_id: helfi_news_groups
 storage_client_config: {  }
-persistent_cache_max_age: -1
+persistent_cache_max_age: 86400
 annotation_entity_type_id: null
 annotation_bundle_id: null
 annotation_field_name: null

diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml
@@ -20,7 +20,7 @@ field_mapper_config:
       value: '$.attributes["name"]'
 storage_client_id: helfi_news_neighbourhoods
 storage_client_config: {  }
-persistent_cache_max_age: -1
+persistent_cache_max_age: 86400
 annotation_entity_type_id: null
 annotation_bundle_id: null
 annotation_field_name: null

diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml
@@ -20,7 +20,7 @@ field_mapper_config:
       value: '$.attributes["name"]'
 storage_client_id: helfi_news_tags
 storage_client_config: {  }
-persistent_cache_max_age: -1
+persistent_cache_max_age: 86400
 annotation_entity_type_id: null
 annotation_bundle_id: null
 annotation_field_name: null

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.7-drupal
+    image: druidfi/mariadb:10.9-drupal
     volumes:
       - db_data:/var/lib/mysql
     ports:

diff --git a/docker/openshift/entrypoints/20-deploy.sh b/docker/openshift/entrypoints/20-deploy.sh
@@ -13,6 +13,11 @@ if [ ! -n "$OPENSHIFT_BUILD_NAME" ]; then
   exit 1
 fi
 
+# Generate twig caches.
+if [ ! -d "/tmp/twig" ]; then
+  drush twig:compile || true
+fi
+
 # This script is run every time a container is spawned and certain environments might
 # start more than one Drupal container. This is used to make sure we run deploy
 # tasks only once per deploy.