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

Automatic update

.platform/schema

@@ -1 +1 @@
-15
+16

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

@@ -27,6 +27,7 @@ hidden:
   neighbourhoods_uuid: true
   node_url: true
   published_at: true
+  search_api_excerpt: true
   short_title: true
   tags: true
   tags_uuid: true

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

@@ -27,6 +27,7 @@ hidden:
   neighbourhoods_uuid: true
   node_url: true
   published_at: true
+  search_api_excerpt: true
   short_title: true
   tags: true
   tags_uuid: true

docker/openshift/Dockerfile

@@ -5,17 +5,15 @@ COPY / /var/www/html/
 WORKDIR /var/www/html
 RUN composer install --no-progress --profile --prefer-dist --no-interaction --no-dev --optimize-autoloader
 
-# Copy ALL deploy scripts
+# Copy custom entrypoints.
+# @see https://github.com/City-of-Helsinki/drupal-docker-images/tree/main/openshift/drupal
+RUN mkdir -p /crons /entrypoints /deploy
 COPY docker/openshift/entrypoints/ /entrypoints
-RUN chmod +x /entrypoints/*
+COPY docker/openshift/crons/ /crons
+COPY docker/openshift/deploy /deploy
+RUN chmod +x /entrypoints/* /deploy/* /crons/*
 
 COPY docker/openshift/init.sh /
 
-# Copy cron scripts
-RUN mkdir /crons
-COPY docker/openshift/crons/ /crons
-COPY docker/openshift/cron-entrypoint.sh /usr/local/bin/cron-entrypoint
-RUN chmod +x /crons/* /usr/local/bin/cron-entrypoint
-
 # Copy nginx overrides.
 COPY docker/openshift/custom.locations /etc/nginx/conf.d/custom.locations

docker/openshift/deploy/10-preflight.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+source /init.sh
+
+if [ -f "../docker/openshift/preflight/preflight.php" ]; then
+  echo "Running preflight checks ..."
+  if ! php ../docker/openshift/preflight/preflight.php; then
+    exit 1
+  fi
+fi
+

docker/openshift/deploy/20-deploy.sh

@@ -0,0 +1,27 @@
+#!/bin/sh
+
+# Skip deployment script if ENV var is true
+if [ "$SKIP_DEPLOY_SCRIPTS" = "true" ]; then
+    echo "SKIP_DEPLOY_SCRIPTS is true. Skipping the steps."
+    return
+fi
+
+source /init.sh
+
+echo "Starting deploy: $(date)"
+
+# Populate deploy ID so 20-deploy.sh is skipped.
+# @todo Remove this once 20-deploy.sh is removed.
+set_deploy_id $OPENSHIFT_BUILD_NAME
+
+drush state:set system.maintenance_mode 1 --input-format=integer
+# Run pre-deploy tasks.
+# @see https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/blob/main/documentation/deploy-hooks.md
+drush helfi:pre-deploy || true
+# Run maintenance tasks (config import, database updates etc)
+drush deploy
+# Run post-deploy tasks.
+# @see https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/blob/main/documentation/deploy-hooks.md
+drush helfi:post-deploy || true
+# Disable maintenance mode
+drush state:set system.maintenance_mode 0 --input-format=integer

docker/openshift/entrypoints/15-twig-compile.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# Populate twig caches.
+if [ ! -d "/tmp/twig" ]; then
+  drush twig:compile || true
+fi

docker/openshift/entrypoints/20-deploy.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# NOTE: This script is being phased out in favor of new deployment job pod.
 
 # Skip deployment script if ENV var is true
 if [ "$SKIP_DEPLOY_SCRIPTS" = "true" ]; then