Update configuration

City-of-Helsinki · Sep 11, 2023 · 9de9089 · 9de9089
1 parent 8441092
commit 9de9089
Show file tree

Hide file tree

Showing 8 changed files with 85 additions and 56 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/filter.format.full_html.yml b/conf/cmi/filter.format.full_html.yml
@@ -7,7 +7,7 @@ dependencies:
     - helfi_api_base
     - linkit
 _core:
-  default_config_hash: r40X436d0Agm1ErbO2TcpT46WfZZpxxplT_X72ju3d4
+  default_config_hash: scZe8VBZbfUiJt0xnoGrHbXgRhTOLA-d3g7Byy1lZ4c
 name: HTML
 format: full_html
 weight: 0
@@ -24,7 +24,7 @@ filters:
     status: true
     weight: -50
     settings:
-      allowed_html: '<em> <strong> <cite> <blockquote role aria-* cite class=""> <code> <ul type class=""> <ol start type> <li class=""> <dl> <dt> <dd> <h2> <h3> <h4> <h5> <h6> <p class=""> <footer class=""> <br> <div role aria-* class=""> <img src alt height width data-entity-type data-entity-uuid data-align data-caption data-responsive-image-style> <a href hreflang !href accesskey id rel target title data-design data-link-text data-selected-icon data-is-external data-protocol class=""> <pre> <s> <sup> <sub> <table> <caption> <tbody> <thead> <tfoot> <th colspan rowspan> <td colspan rowspan> <tr> <hr> <span role aria-* lang dir class="">'
+      allowed_html: '<em> <strong> <cite> <blockquote aria-* class=""> <ul> <ol start> <li> <h2> <h3> <h4> <h5> <h6> <p class=""> <footer class=""> <br> <a href hreflang !href rel target title data-design data-link-text data-selected-icon data-is-external data-protocol class=""> <s> <sup> <sub> <table> <caption> <tbody> <thead> <tfoot> <th colspan rowspan> <td colspan rowspan> <tr> <hr> <span role aria-* lang dir class="">'
       filter_html_help: true
       filter_html_nofollow: false
   filter_htmlcorrector:

diff --git a/conf/cmi/filter.format.minimal.yml b/conf/cmi/filter.format.minimal.yml
@@ -7,7 +7,7 @@ dependencies:
     - helfi_api_base
     - linkit
 _core:
-  default_config_hash: iir5dZUojC1bWTysG1mu4qEgxkT8Le4FLCF6C1hQSoY
+  default_config_hash: 6AGo1h4zFCH6SC4pUy99nHKNsUsd7ZNLffnFw9RiSBA
 name: Minimal
 format: minimal
 weight: 0
@@ -42,7 +42,7 @@ filters:
     status: true
     weight: -50
     settings:
-      allowed_html: '<em> <strong> <ul type> <ol start type> <li> <p class=""> <a href hreflang !href accesskey id rel target title data-design data-link-text data-selected-icon data-is-external data-protocol class=""> <span role aria-* lang dir class="">'
+      allowed_html: '<em> <strong> <ul> <ol start> <li> <p class=""> <a href hreflang !href rel target title data-design data-link-text data-selected-icon data-is-external data-protocol class=""> <span role aria-* lang dir class="">'
       filter_html_help: true
       filter_html_nofollow: false
   filter_htmlcorrector:

diff --git a/docker/openshift/crons/pubsub.sh b/docker/openshift/crons/pubsub.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+echo "Running PubSub daemon: $(date +'%Y-%m-%dT%H:%M:%S%:z')"
+
+i=0
+# Attempt to start this service five times.
+until [ $i -gt 5 ]
+do
+  drush helfi:azure:pubsub-listen
+
+  if [[ "$?" -ne 0 ]]; then
+    ((i=i+1))
+    sleep 10
+  fi
+done
diff --git a/public/sites/default/azure.settings.php b/public/sites/default/azure.settings.php
@@ -22,3 +22,14 @@
 $config['system.performance']['stale_file_threshold'] = 7776000;
 
 $settings['is_azure'] = TRUE;
+
+/**
+ * Deployment identifier.
+ *
+ * Use OpenShift build name (like 'drupal-1234') to determine
+ * if container needs to be invalidated and rebuilt.
+ *
+ * This should fix the issue where deployment fails due to changed service
+ * parameters.
+ */
+$settings['deployment_identifier'] = getenv('OPENSHIFT_BUILD_NAME');
diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php
@@ -276,3 +276,13 @@
     include_once __DIR__ . '/azure.settings.php'; // NOSONAR
   }
 }
+
+/**
+ * Deployment identifier.
+ *
+ * Default 'deployment_identifier' cache key to modified time of 'composer.lock'
+ * file in case it's not already defined.
+ */
+if (empty($settings['deployment_identifier'])) {
+  $settings['deployment_identifier'] = filemtime(__DIR__ . '/../../../composer.lock');
+}
diff --git a/tools/make/docker.mk b/tools/make/docker.mk
@@ -38,7 +38,7 @@ stop: ## Stop the environment
 PHONY += up
 up: ## Launch the environment
 	$(call step,Start up the container(s)...\n)
-	$(call docker_compose,up -d --remove-orphans)
+	$(call docker_compose,up --wait --remove-orphans)
 
 PHONY += shell
 shell: ## Login to CLI container

diff --git a/tools/make/symfony.mk b/tools/make/symfony.mk
@@ -55,7 +55,7 @@ fix-symfony: ## Fix Symfony code style
 PHONY += lint-symfony
 lint-symfony: ## Lint Symfony code style
 	$(call step,Lint Symfony code style...\n)
-	$(call cs_symfony,fix --dry-run --diff --ansi src)
+	$(call cs_symfony,fix --dry-run --diff --ansi --verbose src)
 
 ifeq ($(RUN_ON),docker)
 define sf_console