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

Automatic update

Author: teroelonen

composer.lock

@@ -4,19 +4,19 @@ status: true
 dependencies:
   config:
     - image.style.1.5_1011w_674h
-    - image.style.1.5_1022w_682h_LQ
-    - image.style.1.5_1200w_800h_LQ
-    - image.style.1.5_1298w_866h_LQ
+    - image.style.1.5_1120w_746h_LQ
+    - image.style.1.5_1183w_789h
+    - image.style.1.5_1470w_980h_LQ
     - image.style.1.5_1726w_1152h_LQ
     - image.style.1.5_2022w_1348h_LQ
-    - image.style.1.5_511w_341h
-    - image.style.1.5_600w_400h
-    - image.style.1.5_649w_433h
+    - image.style.1.5_2366w_1578h_LQ
+    - image.style.1.5_560w_373h
+    - image.style.1.5_735w_490h
     - image.style.1.5_863w_576h
   module:
     - helfi_image_styles
 _core:
-  default_config_hash: 5tEd-yvxl-DMt_Sq4YfnYOt00gvTrUIkB2KrYO2_SQQ
+  default_config_hash: ZLqwSHVmZdWTF3DGj7pyo4F6FROSfKeYm3wBcNLVNjg
 id: liftup_left_right
 label: 'Liftup Left/Right'
 image_style_mappings:
@@ -32,42 +32,42 @@ image_style_mappings:
     multiplier: 2x
   -
     image_mapping_type: image_style
-    image_mapping: 1.5_863w_576h
+    image_mapping: 1.5_1183w_789h
     breakpoint_id: helfi_image_styles.l
     multiplier: 1x
   -
     image_mapping_type: image_style
-    image_mapping: 1.5_1726w_1152h_LQ
+    image_mapping: 1.5_2366w_1578h_LQ
     breakpoint_id: helfi_image_styles.l
     multiplier: 2x
   -
     image_mapping_type: image_style
-    image_mapping: 1.5_649w_433h
+    image_mapping: 1.5_863w_576h
     breakpoint_id: helfi_image_styles.m
     multiplier: 1x
   -
     image_mapping_type: image_style
-    image_mapping: 1.5_1298w_866h_LQ
+    image_mapping: 1.5_1726w_1152h_LQ
     breakpoint_id: helfi_image_styles.m
     multiplier: 2x
   -
     image_mapping_type: image_style
-    image_mapping: 1.5_600w_400h
+    image_mapping: 1.5_735w_490h
     breakpoint_id: helfi_image_styles.s
     multiplier: 1x
   -
     image_mapping_type: image_style
-    image_mapping: 1.5_1200w_800h_LQ
+    image_mapping: 1.5_1470w_980h_LQ
     breakpoint_id: helfi_image_styles.s
     multiplier: 2x
   -
     image_mapping_type: image_style
-    image_mapping: 1.5_511w_341h
+    image_mapping: 1.5_560w_373h
     breakpoint_id: helfi_image_styles.xs
     multiplier: 1x
   -
     image_mapping_type: image_style
-    image_mapping: 1.5_1022w_682h_LQ
+    image_mapping: 1.5_1120w_746h_LQ
     breakpoint_id: helfi_image_styles.xs
     multiplier: 2x
 breakpoint_group: helfi_image_styles

conf/cmi/image.style.1.5_1298w_866h_LQ.yml

@@ -7,10 +7,11 @@ RUN composer install --no-progress --profile --prefer-dist --no-interaction --no
 
 # Copy custom entrypoints.
 # @see https://github.com/City-of-Helsinki/drupal-docker-images/tree/main/openshift/drupal
-RUN mkdir -p /crons /entrypoints /deploy
+RUN mkdir -p /crons /entrypoints /hooks/deploy /hooks/post-db-replace
 COPY docker/openshift/entrypoints/ /entrypoints
 COPY docker/openshift/crons/ /crons
-COPY docker/openshift/deploy /deploy
-RUN chmod +x /entrypoints/* /deploy/* /crons/*
+COPY docker/openshift/deploy /hooks/deploy
+COPY docker/openshift/post-db-replace /hooks/post-db-replace
+RUN chmod +x /entrypoints/* /hooks/deploy/* /crons/* /hooks/post-db-replace/*
 
 COPY docker/openshift/init.sh /

conf/cmi/image.style.1.5_649w_433h.yml

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# Run drush deploy after the database has been replaced.
+drush deploy

conf/cmi/responsive_image.styles.liftup_left_right.yml

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ ! -z "$NO_OBFUSCATE_DATA" ]; then
+    echo "NO_OBFUSCATE_DATA is set. Skipping the step."
+    return
+fi
+
+# Obfuscate user data
+drush sql:sanitize

docker/openshift/Dockerfile

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+drush locale-check
+drush locale-update