From 1241b080c680ce17d1a9c7a174ed77bb8e6a85a9 Mon Sep 17 00:00:00 2001 From: Vineet Reddy Rajula <rajula.vineet.reddy@cern.ch> Date: Fri, 28 Oct 2022 17:34:55 +0200 Subject: [PATCH 1/2] Bump PHP core from 7 to 8.1 --- composer.json | 2 +- images/Dockerfile-composerbuilder | 13 ++++++++++--- images/softwareVersions | 8 ++++---- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 64deb4da6..7047cbb46 100644 --- a/composer.json +++ b/composer.json @@ -220,7 +220,7 @@ "drupal/views_bulk_operations": "~4.0.0", "drupal/views_slideshow": "~4.8.0", "drupal/views_taxonomy_term_name_depth": "~7.0.2", - "drupal/viewsreference": "~1.7.0", + "drupal/viewsreference": "~1.8.0", "drupal/webform": "~6.1.0", "drupal/workbench": "~1.3.0", "drupal/workbench_access": "~1.0@beta", diff --git a/images/Dockerfile-composerbuilder b/images/Dockerfile-composerbuilder index 1695e2e77..c8ef83898 100644 --- a/images/Dockerfile-composerbuilder +++ b/images/Dockerfile-composerbuilder @@ -35,7 +35,7 @@ RUN apk --update add \ libcurl \ imagemagick-dev \ imagemagick \ - php7-pecl-imagick \ + php8-pecl-imagick \ bzip2-dev \ ldb-dev \ libldap \ @@ -46,7 +46,7 @@ RUN apk --update add \ libxslt \ net-snmp \ net-snmp-dev \ - php7-mbstring + php8-mbstring # Fix for iconv library # This must be present in the sitebuilder image, @@ -97,6 +97,13 @@ RUN set -eux; \ docker-php-ext-enable igbinary\ ; \ \ + # install xmlrpc + pecl install -o -f xmlrpc\ + ; \ + \ + docker-php-ext-enable xmlrpc\ + ; \ + \ # install msgpack pecl install -o -f msgpack\ ; \ @@ -136,7 +143,7 @@ RUN set -eux; \ sysvshm \ xml \ #wddx \ Does not exist for Drupal9/PHP7.4 - xmlrpc \ + # xmlrpc \ Does not exist for PHP 8.1 xsl \ ; \ \ diff --git a/images/softwareVersions b/images/softwareVersions index 978655fca..840fc86a2 100644 --- a/images/softwareVersions +++ b/images/softwareVersions @@ -1,12 +1,12 @@ -php: '7.4-fpm-alpine3.15' +php: '8.1-rc-fpm-alpine' # These values together define the version of nginx # Ref: https://github.com/nginxinc/docker-nginx/blob/master/stable/alpine/Dockerfile -nginx: '1.20.2' -nginxNJS: '0.7.2' +nginx: '1.22.0' +nginxNJS: '0.7.5' # This value is used to build the composer-builder ONLY. # It will NOT affect the sitebuilder directly. composer: '2.3.5' # This is instead the version of the composer builder that the sitebuilder will use. -composerBuilderTag: 'v9.4-1-RELEASE-2022.07.20T13-09-32Z' +composerBuilderTag: 'php-8.1-4b4a2ec5' -- GitLab From f83762e0c94f33533ef3d198900614c8fca154dd Mon Sep 17 00:00:00 2001 From: Lorenzo Del Pianta <lorenzo.del.pianta.perez@cern.ch> Date: Mon, 17 Oct 2022 17:49:09 +0200 Subject: [PATCH 2/2] added all cern d10 modules --- composer.json | 652 +++++++++++++++++----------------- images/Dockerfile-sitebuilder | 8 +- images/softwareVersions | 2 +- 3 files changed, 326 insertions(+), 336 deletions(-) diff --git a/composer.json b/composer.json index 7047cbb46..c942639c6 100644 --- a/composer.json +++ b/composer.json @@ -1,341 +1,331 @@ { - "name": "drupal/cern-drupal-distribution", - "description": "Defines the Drupal environment supported at CERN", - "type": "project", - "license": "Apache-2.0", - "authors": [ - { - "name": "drupal-admins", - "email": "drupal-admins@cern.ch" - } - ], - "homepage": "https://home.cern", - "support": { - "docs": "https://www.drupal.org/docs/user_guide/en/index.html", - "chat": "https://www.drupal.org/node/314178" - }, - "repositories": [ - { - "type": "composer", - "url": "https://packages.drupal.org/8" - }, - { - "type": "composer", - "url": "https://asset-packagist.org" - }, - { - "type": "vcs", - "url": "https://gitlab.cern.ch/web-team/drupal/public/d9/modules/cern-components.git" - }, - { - "type": "vcs", - "url": "https://gitlab.cern.ch/web-team/drupal/public/d9/modules/cern-paragraph-types.git" - }, - { - "type": "vcs", - "url": "https://gitlab.cern.ch/web-team/drupal/public/d9/modules/cern-full-html-format.git" - }, - { - "type": "vcs", - "url": "https://gitlab.cern.ch/web-team/drupal/public/d9/modules/cern-cds-media.git" - }, - { - "type": "vcs", - "url": "https://gitlab.cern.ch/web-team/drupal/public/d9/modules/cern-landing-page.git" - }, - { - "type": "vcs", - "url": "https://gitlab.cern.ch/web-team/drupal/public/d9/modules/cern-webcast-feeds.git" - }, - { - "type": "vcs", - "url": "https://gitlab.cern.ch/web-team/drupal/public/d9/modules/cern-indico-feeds.git" - }, - { - "type": "vcs", - "url": "https://gitlab.cern.ch/drupal/modules/cern_ldap_api.git" - }, - { - "type": "vcs", - "url": "https://gitlab.cern.ch/drupal/modules/cern_integration.git" - }, - { - "type": "vcs", - "url": "https://gitlab.cern.ch/web-team/drupal/public/d9/modules/drupal-welcome-message-block" - }, - { - "type": "vcs", - "url": "https://gitlab.cern.ch/web-team/drupal/public/d9/themes/adminimal_subtheme.git" + "name": "drupal/cern-drupal-distribution", + "description": "Defines the Drupal environment supported at CERN", + "type": "project", + "license": "Apache-2.0", + "authors": [{ + "name": "drupal-admins", + "email": "drupal-admins@cern.ch" + }], + "homepage": "https://home.cern", + "support": { + "docs": "https://www.drupal.org/docs/user_guide/en/index.html", + "chat": "https://www.drupal.org/node/314178" }, - { - "type": "vcs", - "url": "https://gitlab.cern.ch/web-team/drupal/public/d9/themes/cern.git" - }, - { - "type": "vcs", - "url": "https://gitlab.cern.ch/web-team/drupal/public/d9/themes/cernbase.git" - }, - { - "type": "vcs", - "url": "https://gitlab.cern.ch/web-team/drupal/public/d9/modules/cern-profile-displayname.git" - }, - { - "type": "vcs", - "url": "https://gitlab.cern.ch/web-team/drupal/public/d9/modules/cern-dev-status.git" - }, - { - "type": "vcs", - "url": "https://gitlab.cern.ch/web-team/drupal/public/d9/modules/cern-display-formats.git" - }, - { - "type": "vcs", - "url": "https://gitlab.cern.ch/web-team/drupal/public/d9/modules/cern-loading.git" + "repositories": [{ + "type": "composer", + "url": "https://packages.drupal.org/8" + }, + { + "type": "composer", + "url": "https://asset-packagist.org" + }, + { + "type": "vcs", + "url": "https://gitlab.cern.ch/web-team/drupal/public/d10/modules/cern-components.git" + }, + { + "type": "vcs", + "url": "https://gitlab.cern.ch/web-team/drupal/public/d10/modules/cern-paragraph-types.git" + }, + { + "type": "vcs", + "url": "https://gitlab.cern.ch/web-team/drupal/public/d10/modules/cern-full-html-format.git" + }, + { + "type": "vcs", + "url": "https://gitlab.cern.ch/web-team/drupal/public/d10/modules/cern-cds-media.git" + }, + { + "type": "vcs", + "url": "https://gitlab.cern.ch/web-team/drupal/public/d10/modules/cern-landing-page.git" + }, + { + "type": "vcs", + "url": "https://gitlab.cern.ch/web-team/drupal/public/d10/modules/cern-webcast-feeds.git" + }, + { + "type": "vcs", + "url": "https://gitlab.cern.ch/web-team/drupal/public/d10/modules/cern-indico-feeds.git" + }, + { + "type": "vcs", + "url": "https://gitlab.cern.ch/drupal/modules/cern_ldap_api.git" + }, + { + "type": "vcs", + "url": "https://gitlab.cern.ch/drupal/modules/cern_integration.git" + }, + { + "type": "vcs", + "url": "https://gitlab.cern.ch/web-team/drupal/public/d9/themes/adminimal_subtheme.git" + }, + { + "type": "vcs", + "url": "https://gitlab.cern.ch/web-team/drupal/public/d9/themes/cern.git" + }, + { + "type": "vcs", + "url": "https://gitlab.cern.ch/web-team/drupal/public/d9/themes/cernbase.git" + }, + { + "type": "vcs", + "url": "https://gitlab.cern.ch/web-team/drupal/public/d10/modules/cern-profile-displayname.git" + }, + { + "type": "vcs", + "url": "https://gitlab.cern.ch/web-team/drupal/public/d10/modules/cern-dev-status.git" + }, + { + "type": "vcs", + "url": "https://gitlab.cern.ch/web-team/drupal/public/d10/modules/cern-display-formats.git" + }, + { + "type": "vcs", + "url": "https://gitlab.cern.ch/web-team/drupal/public/d10/modules/cern-loading.git" + }, + { + "type": "vcs", + "url": "https://gitlab.cern.ch/web-team/drupal/public/d10/modules/cern-toolbar.git" + }, + { + "type": "vcs", + "url": "https://gitlab.cern.ch/drupal/profiles.git" + } + ], + "require": { + "php": ">=7.4", + "bower-asset/bootstrap": "~5.1.0", + "bower-asset/ckeditor": "dev-full/4.18.x", + "bower-asset/jquery-cycle": "~3.0.0", + "bower-asset/jquery-hoverintent": "~1.10.0", + "bower-asset/json2": "dev-master", + "ckeditor/ckeditor": "dev-full/4.18.x", + "composer/installers": "~2.0.0", + "cweagans/composer-patches": "~1.7.0", + "dompdf/dompdf": "~2", + "drupal/admin_toolbar": "~3.1.0", + "drupal/adminimal_theme": "~1.6.0", + "drupal/allowed_formats": "~1.4.0", + "drupal/bootstrap": "~3.23.0", + "drupal/captcha": "~1.2.0", + "drupal/cern-adminimal-subtheme": "~2.1.0", + "drupal/cern-base-theme": "~2.6.13", + "drupal/cern-cds-media": "~3.0.0", + "drupal/cern-components": "~3.0.0", + "drupal/cern-dev-status": "~3.0.0", + "drupal/cern-display-formats": "~3.0.0", + "drupal/cern-full-html-format": "~3.0.0", + "drupal/cern-indico-feeds": "~3.0.0", + "drupal/cern-install-profiles": "~8.1.12", + "drupal/cern-integration": "~1.1.1", + "drupal/cern-landing-page": "~3.0.0", + "drupal/cern-ldap-api": "~1.0.0", + "drupal/cern-loading": "~3.0.0", + "drupal/cern-paragraph-types": "~3.0.0", + "drupal/cern-profile-displayname": "~3.0.0", + "drupal/cern-theme": "~2.7.0", + "drupal/cern-toolbar": "~3.0.0", + "drupal/cern-webcast-feeds": "~3.0.0", + "drupal/ckeditor_font": "~1.2.0", + "drupal/codesnippet": "~1.7.0", + "drupal/color_field": "~2.5.0", + "drupal/colorbox": "~1.8.0", + "drupal/colorbutton": "~1.3.0", + "drupal/components": "^3.0@beta", + "drupal/config_update": "~1.7.0", + "drupal/content_access": "~1.0@alpha", + "drupal/context": "~4.1.0", + "drupal/contribute": "~1.x-dev@dev", + "drupal/cookieconsent": "~1.6.0", + "drupal/core-composer-scaffold": "9.4.7", + "drupal/core-project-message": "9.4.7", + "drupal/core-recommended": "9.4.7", + "drupal/ctools": "~3.7.0", + "drupal/devel": "~4.1.1", + "drupal/ds": "~3.13.0", + "drupal/easy_breadcrumb": "~1.15.0", + "drupal/entity_browser": "~2.6.0", + "drupal/entity_print": "~2", + "drupal/entity_reference_revisions": "~1.9.0", + "drupal/externalauth": "~2.0.0", + "drupal/extlink": "~1.6.0", + "drupal/facets": "~2.0.0", + "drupal/fast_404": "~2.0@alpha", + "drupal/features": "~3.12.0", + "drupal/feeds": "3.0-alpha11", + "drupal/fences": "~2.0@RC", + "drupal/field_formatter_class": "~1.5.0", + "drupal/field_group": "~3.2.0", + "drupal/field_permissions": "~1.1.0", + "drupal/filefield_paths": "~1.0@beta", + "drupal/filelog": "~2.0.2", + "drupal/honeypot": "~2.0.1", + "drupal/hook_event_dispatcher": "~3.0.0", + "drupal/hotjar": "~2.2.0", + "drupal/imagemagick": "~3.3.0", + "drupal/imce": "~2.4.0", + "drupal/jquery_ui": "~1.4.0", + "drupal/jquery_ui_accordion": "~1.1.0", + "drupal/jquery_ui_datepicker": "~1.2.0", + "drupal/jquery_ui_draggable": "~1.2.0", + "drupal/jquery_ui_droppable": "~1.2.0", + "drupal/ludwig": "~2.0.0", + "drupal/mailsystem": "~4.3.0", + "drupal/matomo": "~1.14.0", + "drupal/memcache": "~2.3.0", + "drupal/menu_block": "~1.7.0", + "drupal/menu_breadcrumb": "~1.16.0", + "drupal/menu_force": "~1.2.0", + "drupal/metatag": "~1.19.0", + "drupal/migrate_plus": "~5.2.0", + "drupal/migrate_tools": "~5.1.0", + "drupal/migrate_upgrade": "~3.2.0", + "drupal/module_filter": "~3.2.0", + "drupal/node_view_permissions": "~1.5.0", + "drupal/openid_connect": "^1.2", + "drupal/panelbutton": "~1.4.0", + "drupal/panelizer": "~4.4.0", + "drupal/panels": "~4.6.0", + "drupal/paragraphs": "~1.12.0", + "drupal/pathauto": "~1.8.0", + "drupal/permissions_by_term": "~3.1.16", + "drupal/r4032login": "~2.1.0", + "drupal/recaptcha": "~3.0.0", + "drupal/redirect": "~1.7.0", + "drupal/redis": "~1.5.0", + "drupal/require_login": "~2.4.0", + "drupal/rules": "~3.0@alpha", + "drupal/scheduler": "~1.4.0", + "drupal/search_api": "~1.23.0", + "drupal/smart_trim": "~1.3.0", + "drupal/sticky": "~2.0.0", + "drupal/token": "~1.10.0", + "drupal/twig_tweak": "~3.1.3", + "drupal/ui_patterns": "~1.2.0", + "drupal/ui_patterns_ds": "~1.2.0", + "drupal/ui_patterns_field_group": "~1.2.0", + "drupal/ui_patterns_layouts": "~1.2.0", + "drupal/ui_patterns_library": "~1.2.0", + "drupal/upgrade_status": "~3.13.0", + "drupal/userprotect": "~1.1.0", + "drupal/views_bulk_operations": "~4.0.0", + "drupal/views_slideshow": "~4.8.0", + "drupal/views_taxonomy_term_name_depth": "~7.0.2", + "drupal/viewsreference": "~1.8.0", + "drupal/webform": "~6.1.0", + "drupal/workbench": "~1.3.0", + "drupal/workbench_access": "~1.0@beta", + "drupal/workbench_moderation": "~1.6.0", + "drush/drush": "~10.6.2", + "npm-asset/jquery": "~3.6.0", + "vlucas/phpdotenv": "~5.4.0", + "webflo/drupal-finder": "~1.2.0", + "wikimedia/composer-merge-plugin": "~2.0.1" }, - { - "type": "vcs", - "url": "https://gitlab.cern.ch/web-team/drupal/public/d9/modules/cern-toolbar.git" + "require-dev": { + "drupal/core-dev": "^9.3", + "zaporylie/composer-drupal-optimizations": "^1.2" }, - { - "type": "vcs", - "url": "https://gitlab.cern.ch/drupal/profiles.git" - } - ], - "require": { - "php": ">=7.4", - "bower-asset/bootstrap": "~5.1.0", - "bower-asset/ckeditor": "dev-full/4.18.x", - "bower-asset/jquery-cycle": "~3.0.0", - "bower-asset/jquery-hoverintent": "~1.10.0", - "bower-asset/json2": "dev-master", - "ckeditor/ckeditor": "dev-full/4.18.x", - "composer/installers": "~2.0.0", - "cweagans/composer-patches": "~1.7.0", - "dompdf/dompdf": "~2", - "drupal/admin_toolbar": "~3.1.0", - "drupal/adminimal_theme": "~1.6.0", - "drupal/allowed_formats": "~1.4.0", - "drupal/bootstrap": "~3.23.0", - "drupal/captcha": "~1.2.0", - "drupal/cern-adminimal-subtheme": "~2.1.0", - "drupal/cern-base-theme": "~2.6.13", - "drupal/cern-cds-media": "~2.1.4", - "drupal/cern-components": "~2.7.17", - "drupal/cern-dev-status": "~2.0.5", - "drupal/cern-display-formats": "~1.4.6", - "drupal/cern-drupal-welcome-message-block": "~1.1.0", - "drupal/cern-full-html-format": "~2.0.4", - "drupal/cern-indico-feeds": "~2.0.8", - "drupal/cern-install-profiles": "~8.1.11", - "drupal/cern-integration": "~1.1.1", - "drupal/cern-landing-page": "~2.2.6", - "drupal/cern-ldap-api": "~1.0.0", - "drupal/cern-loading": "~2.1.2", - "drupal/cern-paragraph-types": "~2.2.3", - "drupal/cern-profile-displayname": "~2.1.0", - "drupal/cern-theme": "~2.7.0", - "drupal/cern-toolbar": "~2.2.3", - "drupal/cern-webcast-feeds": "~2.0.4", - "drupal/ckeditor_font": "~1.2.0", - "drupal/codesnippet": "~1.7.0", - "drupal/color_field": "~2.5.0", - "drupal/colorbox": "~1.8.0", - "drupal/colorbutton": "~1.3.0", - "drupal/components": "~2.4.0", - "drupal/config_update": "~1.7.0", - "drupal/content_access": "~1.0@alpha", - "drupal/context": "~4.1.0", - "drupal/contribute": "~1.x-dev@dev", - "drupal/cookieconsent": "~1.6.0", - "drupal/core-composer-scaffold": "9.4.7", - "drupal/core-project-message": "9.4.7", - "drupal/core-recommended": "9.4.7", - "drupal/ctools": "~3.7.0", - "drupal/devel": "~4.1.1", - "drupal/ds": "~3.13.0", - "drupal/easy_breadcrumb": "~1.15.0", - "drupal/entity_browser": "~2.6.0", - "drupal/entity_print": "~2", - "drupal/entity_reference_revisions": "~1.9.0", - "drupal/externalauth": "~2.0.0", - "drupal/extlink": "~1.6.0", - "drupal/facets": "~2.0.0", - "drupal/fast_404": "~2.0@alpha", - "drupal/features": "~3.12.0", - "drupal/feeds": "3.0-alpha11", - "drupal/fences": "~2.0@RC", - "drupal/field_formatter_class": "~1.5.0", - "drupal/field_group": "~3.2.0", - "drupal/field_permissions": "~1.1.0", - "drupal/filefield_paths": "~1.0@beta", - "drupal/filelog": "~2.0.2", - "drupal/honeypot": "~2.0.1", - "drupal/hook_event_dispatcher": "~3.0.0", - "drupal/hotjar": "~2.2.0", - "drupal/imagemagick": "~3.3.0", - "drupal/imce": "~2.4.0", - "drupal/jquery_ui": "~1.4.0", - "drupal/jquery_ui_accordion": "~1.1.0", - "drupal/jquery_ui_datepicker": "~1.2.0", - "drupal/jquery_ui_draggable": "~1.2.0", - "drupal/jquery_ui_droppable": "~1.2.0", - "drupal/ludwig": "~2.0.0", - "drupal/mailsystem": "~4.3.0", - "drupal/matomo": "~1.14.0", - "drupal/memcache": "~2.3.0", - "drupal/menu_block": "~1.7.0", - "drupal/menu_breadcrumb": "~1.16.0", - "drupal/menu_force": "~1.2.0", - "drupal/metatag": "~1.19.0", - "drupal/migrate_plus": "~5.2.0", - "drupal/migrate_tools": "~5.1.0", - "drupal/migrate_upgrade": "~3.2.0", - "drupal/module_filter": "~3.2.0", - "drupal/node_view_permissions": "~1.5.0", - "drupal/openid_connect": "^1.2", - "drupal/panelbutton": "~1.4.0", - "drupal/panelizer": "~4.4.0", - "drupal/panels": "~4.6.0", - "drupal/paragraphs": "~1.12.0", - "drupal/pathauto": "~1.8.0", - "drupal/permissions_by_term": "~3.1.16", - "drupal/r4032login": "~2.1.0", - "drupal/recaptcha": "~3.0.0", - "drupal/redirect": "~1.7.0", - "drupal/redis": "~1.5.0", - "drupal/require_login": "~2.4.0", - "drupal/rules": "~3.0@alpha", - "drupal/scheduler": "~1.4.0", - "drupal/search_api": "~1.23.0", - "drupal/smart_trim": "~1.3.0", - "drupal/sticky": "~2.0.0", - "drupal/token": "~1.10.0", - "drupal/twig_tweak": "~3.1.3", - "drupal/ui_patterns": "~1.2.0", - "drupal/ui_patterns_ds": "~1.2.0", - "drupal/ui_patterns_field_group": "~1.2.0", - "drupal/ui_patterns_layouts": "~1.2.0", - "drupal/ui_patterns_library": "~1.2.0", - "drupal/upgrade_status": "~3.13.0", - "drupal/userprotect": "~1.1.0", - "drupal/views_bulk_operations": "~4.0.0", - "drupal/views_slideshow": "~4.8.0", - "drupal/views_taxonomy_term_name_depth": "~7.0.2", - "drupal/viewsreference": "~1.8.0", - "drupal/webform": "~6.1.0", - "drupal/workbench": "~1.3.0", - "drupal/workbench_access": "~1.0@beta", - "drupal/workbench_moderation": "~1.6.0", - "drush/drush": "~10.6.2", - "npm-asset/jquery": "~3.6.0", - "vlucas/phpdotenv": "~5.4.0", - "webflo/drupal-finder": "~1.2.0", - "wikimedia/composer-merge-plugin": "~2.0.1" - }, - "require-dev": { - "drupal/core-dev": "^9.3", - "zaporylie/composer-drupal-optimizations": "^1.2" - }, - "conflict": { - "drupal/drupal": "*" - }, - "minimum-stability": "dev", - "prefer-stable": true, - "config": { - "discard-changes": true, - "sort-packages": true, - "allow-plugins": { - "composer/installers": true, - "dealerdirect/phpcodesniffer-composer-installer": true, - "cweagans/composer-patches": true, - "drupal/core-composer-scaffold": true, - "drupal/core-project-message": true, - "wikimedia/composer-merge-plugin": true, - "zaporylie/composer-drupal-optimizations": true, - "simplesamlphp/composer-module-installer": true - } - }, - "autoload": { - "classmap": [ - "scripts/composer/ScriptHandler.php" - ], - "files": ["load.environment.php"] - }, - "scripts": { - "pre-install-cmd": [ - "DrupalProject\\composer\\ScriptHandler::checkComposerVersion" - ], - "pre-update-cmd": [ - "DrupalProject\\composer\\ScriptHandler::checkComposerVersion" - ], - "post-install-cmd": [ - "@putenv CKEDITOR_PLUGIN_VERSION=4.18.0", - "DrupalProject\\composer\\ScriptHandler::createRequiredFiles", - "scripts/post-setup-actions.sh" - ], - "post-update-cmd": [ - "@putenv CKEDITOR_PLUGIN_VERSION=4.18.0", - "DrupalProject\\composer\\ScriptHandler::createRequiredFiles", - "scripts/post-setup-actions.sh" - ] - }, - "extra": { - "drupal-scaffold": { - "locations": { - "web-root": "web/" - } + "conflict": { + "drupal/drupal": "*" }, - "installer-paths": { - "web/core": ["type:drupal-core"], - "web/libraries/{$name}": ["type:drupal-library"], - "web/modules/contrib/{$name}": ["type:drupal-module"], - "web/profiles/contrib/{$name}": ["type:drupal-profile"], - "web/themes/contrib/{$name}": ["type:drupal-theme"], - "drush/Commands/contrib/{$name}": ["type:drupal-drush"], - "web/modules/custom/{$name}": ["type:drupal-custom-module"], - "web/themes/custom/{$name}": ["type:drupal-custom-theme"] + "minimum-stability": "dev", + "prefer-stable": true, + "config": { + "discard-changes": true, + "sort-packages": true, + "allow-plugins": { + "composer/installers": true, + "dealerdirect/phpcodesniffer-composer-installer": true, + "cweagans/composer-patches": true, + "drupal/core-composer-scaffold": true, + "drupal/core-project-message": true, + "wikimedia/composer-merge-plugin": true, + "zaporylie/composer-drupal-optimizations": true, + "simplesamlphp/composer-module-installer": true + } }, - "patchLevel": { + "autoload": { + "classmap": [ + "scripts/composer/ScriptHandler.php" + ], + "files": ["load.environment.php"] }, - "patches": { - "drupal/core": { - "DRUPAL-302: Allow tokens to be used in Text Editor image upload directory path": "patches/allow_tokens_in_text_editor-2830210-14.patch", - "DRUPAL-496: TermName views argument_validator is not working as expected": "patches/drupal_views_argument_validator_TermName-2494617-99.patch", - "DRUPAL-567: Cannot save translated nodes after upgrading to 8.8 due to invalid path": "patches/3101344-drupal-core-fix-permissions-checking-while-node-translating-64.patch", - "DRUPAL-503: Support enclosure field in Views RssFields row plugin": "patches/views-rss-fields-enclosure-2511878-35.patch", - "Fixes UID base filed still having old default value callbacks https://www.drupal.org/project/drupal/issues/3153455": "patches/3153455-104.patch", - "Fixes crash if an external URL is specified in page path https://www.drupal.org/project/drupal/issues/2973422": "patches/save_views_external_url-2973422-19.patch", - "Fixes call to a member function getAccountName() on null https://www.drupal.org/project/drupal/issues/3161212": "patches/core-node_add_author_error-3161212-2-9.x.patch", - "Fixes multiple usages of FieldPluginBase::getEntity missing null checks https://www.drupal.org/project/drupal/issues/3007424": "patches/3007424-108.patch", - "Fixes TypeError on FileUrlGenerator::generateString for >= 9.3.x https://www.drupal.org/project/drupal/issues/3254245": "patches/3254245-78.patch" - }, - "drupal/paragraphs": { - "DRUPAL-466: adds the widget that fixes the landing pages issues\n WARNING: there is a new version of this patch upstream for PHP7.2 with some community validation. But since this version still applies cleanly, we wont update it yet.": "patches/experimental-widget-asymetric-translation-2904705-47.patch" - }, - "drupal/openid_connect": { - "OIDC roles mapping from JWT https://www.drupal.org/project/openid_connect/issues/3166508": "patches/openid_connect-3166508-role-mapping.patch", - "OIDC autologin (skip Drupal login page) https://www.drupal.org/project/openid_connect/issues/3011413": "patches/openid_connect-3011413-autologin.patch", - "OIDC default redirection after login to / instead of /user/{user_id} ": "patches/openid_connect-custom-default-redirection.patch" - }, - "drupal/captcha": { - "Fixes CAPTCHAs not loading due to not being able to access font directory https://www.drupal.org/project/captcha/issues/3211385": "patches/captcha-white-image-captcha-3211385-12.patch" - }, - "drupal/scheduler": { - "Hardcoded local task dependency on view.scheduler_scheduled_content": "patches/scheduler-view-dependency-3224340.patch" - }, - "__comments__": { - } + "scripts": { + "pre-install-cmd": [ + "DrupalProject\\composer\\ScriptHandler::checkComposerVersion" + ], + "pre-update-cmd": [ + "DrupalProject\\composer\\ScriptHandler::checkComposerVersion" + ], + "post-install-cmd": [ + "@putenv CKEDITOR_PLUGIN_VERSION=4.18.0", + "DrupalProject\\composer\\ScriptHandler::createRequiredFiles", + "scripts/post-setup-actions.sh" + ], + "post-update-cmd": [ + "@putenv CKEDITOR_PLUGIN_VERSION=4.18.0", + "DrupalProject\\composer\\ScriptHandler::createRequiredFiles", + "scripts/post-setup-actions.sh" + ] }, - "merge-plugin": { - "include": [ - "composer.user.json" - ], - "recurse": true, - "replace": false, - "ignore-duplicates": true, - "merge-dev": true, - "merge-extra": true, - "merge-extra-deep": true, - "merge-scripts": true + "extra": { + "drupal-scaffold": { + "locations": { + "web-root": "web/" + } + }, + "installer-paths": { + "web/core": ["type:drupal-core"], + "web/libraries/{$name}": ["type:drupal-library"], + "web/modules/contrib/{$name}": ["type:drupal-module"], + "web/profiles/contrib/{$name}": ["type:drupal-profile"], + "web/themes/contrib/{$name}": ["type:drupal-theme"], + "drush/Commands/contrib/{$name}": ["type:drupal-drush"], + "web/modules/custom/{$name}": ["type:drupal-custom-module"], + "web/themes/custom/{$name}": ["type:drupal-custom-theme"] + }, + "patchLevel": {}, + "patches": { + "drupal/core": { + "DRUPAL-302: Allow tokens to be used in Text Editor image upload directory path": "patches/allow_tokens_in_text_editor-2830210-14.patch", + "DRUPAL-496: TermName views argument_validator is not working as expected": "patches/drupal_views_argument_validator_TermName-2494617-99.patch", + "DRUPAL-567: Cannot save translated nodes after upgrading to 8.8 due to invalid path": "patches/3101344-drupal-core-fix-permissions-checking-while-node-translating-64.patch", + "DRUPAL-503: Support enclosure field in Views RssFields row plugin": "patches/views-rss-fields-enclosure-2511878-35.patch", + "Fixes UID base filed still having old default value callbacks https://www.drupal.org/project/drupal/issues/3153455": "patches/3153455-104.patch", + "Fixes crash if an external URL is specified in page path https://www.drupal.org/project/drupal/issues/2973422": "patches/save_views_external_url-2973422-19.patch", + "Fixes call to a member function getAccountName() on null https://www.drupal.org/project/drupal/issues/3161212": "patches/core-node_add_author_error-3161212-2-9.x.patch", + "Fixes multiple usages of FieldPluginBase::getEntity missing null checks https://www.drupal.org/project/drupal/issues/3007424": "patches/3007424-108.patch", + "Fixes TypeError on FileUrlGenerator::generateString for >= 9.3.x https://www.drupal.org/project/drupal/issues/3254245": "patches/3254245-78.patch" + }, + "drupal/paragraphs": { + "DRUPAL-466: adds the widget that fixes the landing pages issues\n WARNING: there is a new version of this patch upstream for PHP7.2 with some community validation. But since this version still applies cleanly, we wont update it yet.": "patches/experimental-widget-asymetric-translation-2904705-47.patch" + }, + "drupal/openid_connect": { + "OIDC roles mapping from JWT https://www.drupal.org/project/openid_connect/issues/3166508": "patches/openid_connect-3166508-role-mapping.patch", + "OIDC autologin (skip Drupal login page) https://www.drupal.org/project/openid_connect/issues/3011413": "patches/openid_connect-3011413-autologin.patch", + "OIDC default redirection after login to / instead of /user/{user_id} ": "patches/openid_connect-custom-default-redirection.patch" + }, + "drupal/captcha": { + "Fixes CAPTCHAs not loading due to not being able to access font directory https://www.drupal.org/project/captcha/issues/3211385": "patches/captcha-white-image-captcha-3211385-12.patch" + }, + "drupal/scheduler": { + "Hardcoded local task dependency on view.scheduler_scheduled_content": "patches/scheduler-view-dependency-3224340.patch" + }, + "__comments__": {} + }, + "merge-plugin": { + "include": [ + "composer.user.json" + ], + "recurse": true, + "replace": false, + "ignore-duplicates": true, + "merge-dev": true, + "merge-extra": true, + "merge-extra-deep": true, + "merge-scripts": true + } } - } } diff --git a/images/Dockerfile-sitebuilder b/images/Dockerfile-sitebuilder index 46baf74dc..d639a1d54 100644 --- a/images/Dockerfile-sitebuilder +++ b/images/Dockerfile-sitebuilder @@ -87,10 +87,10 @@ ENV PATH=$PATH:${DRUPAL_APP_DIR}/vendor/bin RUN cp ${DRUPAL_APP_DIR}/composer.json ${DRUPAL_APP_DIR}/composer.admins.json # Put symlinks for profiles/themes/modules to a path where old Drupal sites expect to find them -RUN ln -s contrib/cern-install-profiles/cern ${DRUPAL_APP_DIR}/web/profiles/cern && \ - ln -s contrib/cern-install-profiles/easystart ${DRUPAL_APP_DIR}/web/profiles/easystart && \ - ln -s cern-theme ${DRUPAL_APP_DIR}/web/themes/custom/cernclean &&\ - ln -s cern-base-theme ${DRUPAL_APP_DIR}/web/themes/custom/cernbase + RUN ln -s contrib/cern-install-profiles/cern ${DRUPAL_APP_DIR}/web/profiles/cern && \ + ln -s contrib/cern-install-profiles/easystart ${DRUPAL_APP_DIR}/web/profiles/easystart && \ + ln -s cern-theme ${DRUPAL_APP_DIR}/web/themes/custom/cernclean &&\ + ln -s cern-base-theme ${DRUPAL_APP_DIR}/web/themes/custom/cernbase # Add extra configurations # At this point, composer has created the required settings.php through: diff --git a/images/softwareVersions b/images/softwareVersions index 840fc86a2..ed5279faa 100644 --- a/images/softwareVersions +++ b/images/softwareVersions @@ -9,4 +9,4 @@ nginxNJS: '0.7.5' # It will NOT affect the sitebuilder directly. composer: '2.3.5' # This is instead the version of the composer builder that the sitebuilder will use. -composerBuilderTag: 'php-8.1-4b4a2ec5' +composerBuilderTag: 'v9.4-2-RELEASE-2022.10.28T15-35-05Z' -- GitLab