Release 2

.github/workflows/comment.yml

@@ -233,8 +233,6 @@ jobs:
                   volumeMounts:
                   - mountPath: /drupal/web/sites/default/files
                     volumeName: filesharevol
-                  - mountPath: /drupal/data/default/private
-                    volumeName: privsharevol
                   env:
                   - name: MYSQL_HOST
                     value: mariadb-ecc-uks-dev.mariadb.database.azure.com

.gitlab-ci.yml

@@ -54,8 +54,8 @@ generate-sbom:
     - apk add bash curl --update-cache
     - curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b /usr/local/bin
   script:
-    - docker pull ${DOCKER_REGISTRY}/portal-intranet-fpm${tag}
-    - syft docker:${DOCKER_REGISTRY}/portal-intranet-fpm${tag} -o json=dockerimage.sbom.json
+    - docker pull ${DOCKER_REGISTRY}/intranet-drupal-fpm${tag}
+    - syft docker:${DOCKER_REGISTRY}/intranet-drupal-fpm${tag} -o json=dockerimage.sbom.json
   only:
     - develop
     - /^release\//

Dockerfile-drupal

@@ -59,18 +59,10 @@ RUN pecl channel-update pecl.php.net \
 # Download and install Composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
-# Download and install security checker
-ENV PHP_CHECKER_VERSION=1.0.0
-RUN curl -o /tmp/security_checker -L "https://github.com/fabpot/local-php-security-checker/releases/download/v${PHP_CHECKER_VERSION}/local-php-security-checker_${PHP_CHECKER_VERSION}_linux_amd64" \
-    && mv /tmp/security_checker /usr/bin/local-php-security-checker \
-    && chmod +x /usr/bin/local-php-security-checker
-
 # create volume for shared SSH keys
 RUN mkdir -p /drupal/data/default/ssh-keys
 VOLUME ["/drupal/data/default/ssh-keys"]
 
-
-
 # create Drupal folders
 RUN mkdir -p /drupal/web/sites/default/files \
   && mkdir -p /drupal/data/default/private \
@@ -89,7 +81,6 @@ WORKDIR /drupal
 
 RUN sed -i 's;listen = /run/php/php8.1-fpm.sock;listen = 9000;' /etc/php/8.1/fpm/pool.d/www.conf
 RUN echo "clear_env = no" >> /etc/php/8.1/fpm/pool.d/www.conf
-RUN echo 'extension="memcached.so"' >> /etc/php/8.1/fpm/conf.d/20-memcached.ini
 RUN sed -i 's;expose_php = on;expose_php = off;' /etc/php/8.1/fpm/php.ini && mkdir -p /run/php
 RUN sed -i 's;memory_limit = 128M;memory_limit = 512M;' /etc/php/8.1/fpm/php.ini
 RUN sed -i 's;upload_max_filesize = 2M;upload_max_filesize = 128M;' /etc/php/8.1/fpm/php.ini

composer.json

@@ -29,6 +29,10 @@
             "type": "github",
             "url":  "https://github.com/essexcountycouncil/ecc_cludo_search"
         },
+        {
+            "type": "github",
+            "url": "https://github.com/essexcountycouncil/ecc_parents"
+        },
         {
             "type": "github",
             "url":  "https://github.com/essexcountycouncil/ecc_theme"
@@ -60,7 +64,8 @@
         "drupal/ckeditor5_icons": "^1.0@RC",
         "drupal/ckeditor_div_manager": "^3",
         "drupal/cludo_search": "^1.0@beta",
-        "drupal/config_ignore": "^2.4",
+        "drupal/config_filter": "^2.6",
+        "drupal/config_ignore": "^3.3",
         "drupal/config_split": "^2",
         "drupal/core-composer-scaffold": "^10",
         "drupal/core-project-message": "^10",
@@ -110,6 +115,7 @@
         "essexcountycouncil/ecc_content_moderation": "^1.0",
         "essexcountycouncil/ecc_cookie_compliance": "^1.0",
         "essexcountycouncil/ecc_menu": "^1.0",
+        "essexcountycouncil/ecc_parents": "^1.0",
         "essexcountycouncil/ecc_theme": "^1.1",
         "localgovdrupal/localgov": "^3",
         "localgovdrupal/localgov_base": "^1.4",
@@ -131,7 +137,6 @@
         "phpspec/prophecy-phpunit": "^2",
         "phpstan/phpstan": "^1.0",
         "phpstan/phpstan-deprecation-rules": "^1.0",
-        "roave/security-advisories": "dev-latest",
         "squizlabs/php_codesniffer": "^3.6"
     },
     "conflict": {
@@ -151,6 +156,11 @@
             "php-http/discovery": true,
             "mglaman/composer-drupal-lenient": true,
             "phpstan/extension-installer": true
+        },
+        "audit": {
+             "ignore": {
+                 "GHSA-mg8j-w93w-xjgc": "Apache has been configured to block access to applicable paths"
+            }
         }
     },
     "autoload": {
@@ -161,17 +171,18 @@
     "extra": {
         "enable-patching": true,
         "patches": {
+            "drupal/autosave_form": {
+                "Disable autosaving for layout builder pages": "https://www.drupal.org/files/issues/2024-09-09/3270955-5-layout_builder.patch"
+            },
             "drupal/cludo_search": {
                 "Change title of search page.": "patches/cludo_search-page-tweaks.patch",
                 "Remove cludo supplied search page template.": "patches/cludo_remove_default_template",
                 "Automated Drupal 10 compatibility fixes": "https://www.drupal.org/files/issues/2022-07-18/cludo_search.1.0-beta2.rector.patch"
             },
             "drupal/core": {
-                "Remove this patch after upgrading Localgov profile": "https://www.drupal.org/files/issues/2024-04-16/2845144-95.patch",
-                "Allow chmod to fail in the public namespace if the resultant mode is 777": "patches/filesystem-chmod-0001.patch"
+                "Remove this patch after upgrading Localgov profile": "https://www.drupal.org/files/issues/2024-04-16/2845144-95.patch"
             },
             "drupal/fathom_analytics": {
-                "Issue #3380665: Defer attribute should be boolean": "https://git.drupalcode.org/project/fathom_analytics/-/merge_requests/2.diff",
                 "Automated Drupal 10 compatibility fixes": "https://www.drupal.org/files/issues/2022-06-15/fathom_analytics.3.0.0.rector.patch"
             },
             "drupal/geo_entity": {
@@ -180,6 +191,9 @@
             "drupal/group": {
                 "Apply some custom functionality for Essex when adding members to Groups ECCI-287/ECCI-286": "patches/essex-group-membership.patch"
             },
+            "drupal/honeypot": {
+                "honeypot clientside": "https://www.drupal.org/files/issues/2024-08-16/clientside_time_limit_2_1_4.patch"
+            },
             "drupal/openid_connect": {
                 "Truncate username if it is greater than 60 characters": "https://www.drupal.org/files/issues/2021-12-08/data_too_long_for_column_name-%203252021-8.patch"
             },
@@ -199,8 +213,9 @@
             "localgovdrupal/localgov_subsites": {
                 "Show page heading block for subsites pages": "patches/localgov_subsites.patch"
             },
-            "drupal/honeypot": {
-              "honeypot clientside": "https://www.drupal.org/files/issues/2024-08-16/clientside_time_limit_2_1_4.patch"
+            "localgovdrupal/localgov_workflows": {
+                "New Content by owner View": "https://patch-diff.githubusercontent.com/raw/localgovdrupal/localgov_workflows/pull/104.diff",
+                "Service contact delete form": "patches/localgov_workflows_delete_service_contact.patch"
             }
         },
         "drupal-scaffold": {