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

Automatic update
City-of-Helsinki · Dec 12, 2024 · 05ccd63 · 05ccd63
2 parents 0db09d2 + c7f1ef0
commit 05ccd63
Show file tree

Hide file tree

Showing 39 changed files with 1,052 additions and 99 deletions.
diff --git a/.github/workflows/artifact.yml b/.github/workflows/artifact.yml
@@ -9,7 +9,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/city-of-helsinki/drupal-php-docker:8.3-alpine
+      image: ghcr.io/city-of-helsinki/drupal-web:8.3
 
     services:
       db:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -5,13 +5,12 @@ on:
 name: CI
 env:
   SYMFONY_DEPRECATIONS_HELPER: disabled
-  SIMPLETEST_BASE_URL: http://app:8888
 jobs:
   tests:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/city-of-helsinki/drupal-php-docker:8.3-alpine
-      options: --hostname app
+      image: ghcr.io/city-of-helsinki/drupal-web:8.3
+      options: --hostname app --user 1001
 
     services:
       db:
@@ -26,6 +25,13 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+        # Actions worker overrides the default entrypoint with "tail -f /dev/null", so
+        # we have to start services manually.
+      - name: Start services
+        env:
+          WEBROOT: ${{ github.workspace }}/public
+        run: entrypoint &
+
       - name: Set browsertest output folder
         run: |
           echo "BROWSERTEST_OUTPUT_DIRECTORY=$GITHUB_WORKSPACE/public/sites/simpletest" >> $GITHUB_ENV
@@ -69,10 +75,7 @@ jobs:
 
       - name: Start services
         run: |
-          drush runserver $SIMPLETEST_BASE_URL --dns > /dev/null 2>&1 &
-
-          # Wait for drush server to start.
-          for i in {1..5}; do RESPONSE_CODE=$(curl -s -o /dev/null -w "%{http_code}" "$SIMPLETEST_BASE_URL" || true); if [ "$RESPONSE_CODE" -gt "301" ] || [ "$RESPONSE_CODE" -lt "200" ]; then sleep 2; fi; done
+          for i in {1..5}; do RESPONSE_CODE=$(curl -k -s -o /dev/null -w "%{http_code}" "$SIMPLETEST_BASE_URL" || true); if [ "$RESPONSE_CODE" -gt "301" ] || [ "$RESPONSE_CODE" -lt "200" ]; then sleep 2; fi; done
 
       - name: Run PHPUnit tests
         run: |

diff --git a/.github/workflows/update-config.yml b/.github/workflows/update-config.yml
@@ -9,7 +9,8 @@ jobs:
   update-config:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/city-of-helsinki/drupal-php-docker:8.3-alpine
+      image: ghcr.io/city-of-helsinki/drupal-web:8.3
+      options: --hostname app --user 1001
     services:
       db:
         image: mysql:8

diff --git a/compose.yaml b/compose.yaml
@@ -8,6 +8,7 @@ services:
     depends_on:
       - db
     environment:
+      WEBROOT: /app/public
       STAGE_FILE_PROXY_ORIGIN: "${STAGE_FILE_PROXY_ORIGIN}"
       STAGE_FILE_PROXY_ORIGIN_DIR: "${STAGE_FILE_PROXY_ORIGIN_DIR}"
       APP_ENV: "${APP_ENV:-local}"
@@ -24,7 +25,6 @@ services:
       # DOCKERHOST: host.docker.internal
       # Use drush server to run functional tests, so we don't have to care about
       # permission or SSL issues.
-      SIMPLETEST_BASE_URL: "http://app:8888"
       BROWSERTEST_OUTPUT_BASE_URL: "https://${DRUPAL_HOSTNAME}"
       BROWSERTEST_OUTPUT_DIRECTORY: "/app/public/sites/default/files/simpletest"
       DRUPAL_VARNISH_HOST: "${COMPOSE_PROJECT_NAME}-varnish"
@@ -160,13 +160,21 @@ services:
     profiles:
       - queue
   chromium:
-    # @todo Update this to newer version once minkphp supports Selenium 4.
-    # @see https://github.com/minkphp/MinkSelenium2Driver/pull/372
-    image: seleniarm/standalone-chromium:106.0
+    image: selenium/standalone-chromium
+    environment:
+      SE_NODE_OVERRIDE_MAX_SESSIONS: "true"
+      SE_NODE_MAX_SESSIONS: "16"
+      SE_START_XVFB: "false"
+      SE_START_VNC: "false"
+      SE_SESSION_RETRY_INTERVAL: "1"
+      SE_SESSION_REQUEST_TIMEOUT: "10"
+    depends_on:
+      - app
     networks:
       - internal
     profiles:
       - testing
+
 networks:
   internal:
     external: false

diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.entity_form_display.paragraph.accordion.default.yml b/conf/cmi/core.entity_form_display.paragraph.accordion.default.yml
@@ -15,7 +15,7 @@ dependencies:
     - paragraphs
     - text
 _core:
-  default_config_hash: K8HsAl3NXcMTSRfcQq_JTJfYA74VrVpE94gTYWIUUpI
+  default_config_hash: RF5jnF9_MPS0ILEZyGlsFs74Q68B1ii5mqyLnSZC67g
 id: paragraph.accordion.default
 targetEntityType: paragraph
 bundle: accordion

diff --git a/conf/cmi/core.entity_form_display.paragraph.accordion_item.default.yml b/conf/cmi/core.entity_form_display.paragraph.accordion_item.default.yml
@@ -14,7 +14,7 @@ dependencies:
     config:
       - paragraphs.paragraphs_type.accordion_item
 _core:
-  default_config_hash: f3ncPjM7WKsN-bLZVQXMbSKIUMZYRk51A9j1Yly5XsE
+  default_config_hash: 51mHm2O7Corvv_lfh2IeFdXy3zf8Uj5dgxtkmWy39yI
 id: paragraph.accordion_item.default
 targetEntityType: paragraph
 bundle: accordion_item

diff --git a/conf/cmi/core.entity_view_display.paragraph.accordion.default.yml b/conf/cmi/core.entity_view_display.paragraph.accordion.default.yml
@@ -15,7 +15,7 @@ dependencies:
     - options
     - text
 _core:
-  default_config_hash: yJAD4ny-ijX5i6mYmUprDsh_4JqcMH8yIk6PNNRNUDQ
+  default_config_hash: e0ru9L96p-nQWFm3QJofXJmuuQ20FakJ6yrGmoRtA58
 id: paragraph.accordion.default
 targetEntityType: paragraph
 bundle: accordion

diff --git a/conf/cmi/core.entity_view_display.paragraph.accordion_item.default.yml b/conf/cmi/core.entity_view_display.paragraph.accordion_item.default.yml
@@ -11,7 +11,7 @@ dependencies:
     - entity_reference_revisions
     - hdbt_admin_tools
 _core:
-  default_config_hash: WvxeLovAeRn181zqTY9mqQlEUH2qKUDh3w1g2KROZoA
+  default_config_hash: nEdDaeghKYX4hYMccTAO5M0h4TLAiNAsYf2ouXYD2Sc
 id: paragraph.accordion_item.default
 targetEntityType: paragraph
 bundle: accordion_item

diff --git a/conf/cmi/field.field.paragraph.accordion.field_accordion_description.yml b/conf/cmi/field.field.paragraph.accordion.field_accordion_description.yml
@@ -13,7 +13,7 @@ third_party_settings:
     allowed_formats:
       - minimal
 _core:
-  default_config_hash: kOxXsJuDVcymIAy7jnni6GM5q5SPGSrxwmWJiJ4Sr7c
+  default_config_hash: j-K-qnxmYJISH2FD5kP90WEvaYPac3scFywf6jjx6AA
 id: paragraph.accordion.field_accordion_description
 field_name: field_accordion_description
 entity_type: paragraph

diff --git a/conf/cmi/field.field.paragraph.accordion.field_accordion_design.yml b/conf/cmi/field.field.paragraph.accordion.field_accordion_design.yml
@@ -8,7 +8,7 @@ dependencies:
   module:
     - options
 _core:
-  default_config_hash: C3J06vDzYUJdSIAwQhoBHO4eG5T2H--lbC1h74-KDJ4
+  default_config_hash: iRAjLGNSuLvmNMEA6EiasJbbsseWnuhpbvg6xXIkL2s
 id: paragraph.accordion.field_accordion_design
 field_name: field_accordion_design
 entity_type: paragraph

diff --git a/conf/cmi/field.field.paragraph.accordion.field_accordion_heading_level.yml b/conf/cmi/field.field.paragraph.accordion.field_accordion_heading_level.yml
@@ -8,7 +8,7 @@ dependencies:
   module:
     - options
 _core:
-  default_config_hash: HZVr6AVX7ihLKrsewEHabJxkhrHFUugKszp7Z_B1slk
+  default_config_hash: huFW_rCFjaNvMUbdEaFO_KzbeRqHg9Kvk6w9bICJX5w
 id: paragraph.accordion.field_accordion_heading_level
 field_name: field_accordion_heading_level
 entity_type: paragraph