diff --git a/images/10x/open-social/Dockerfile b/images/10x/open-social/Dockerfile index 4c81e36..c728376 100644 --- a/images/10x/open-social/Dockerfile +++ b/images/10x/open-social/Dockerfile @@ -7,14 +7,12 @@ ENV DISTRO="social" \ PROFILE="social" # This is an installation from a composer template -RUN COMPOSER=composer.json composer remove drupal/core-composer-scaffold --quiet --no-ansi --no-interaction --no-progress -RUN COMPOSER=composer.json composer remove drupal/core-recommended --quiet --no-ansi --no-interaction --no-progress -RUN COMPOSER=composer.json composer remove drush/drush --quiet --no-ansi --no-interaction --no-progress +RUN rm -f /opt/drupal/composer.json +RUN rm -f /opt/drupal/composer.lock -RUN COMPOSER=composer.json composer require goalgorilla/open_social:${VERSION} \ - --quiet --no-ansi --no-interaction --no-progress +COPY composer.json /opt/drupal/composer.json -RUN COMPOSER=composer.json composer require drush/drush \ +RUN COMPOSER=composer.json composer install \ --quiet --no-ansi --no-interaction --no-progress # Install Drupal diff --git a/images/10x/open-social/composer.json b/images/10x/open-social/composer.json new file mode 100644 index 0000000..934a43e --- /dev/null +++ b/images/10x/open-social/composer.json @@ -0,0 +1,78 @@ +{ + "name": "drupal8/distros", + "type": "project", + "description": "A reusable template for Distros.bid", + "homepage": "https://www.drupal.org/project/drupal", + "license": "GPL-2.0-or-later", + "require": { + "goalgorilla/open_social": "12.4.5", + "drush/drush": "^12" + }, + "conflict": { + "drupal/drupal": "*" + }, + "config": { + "allow-plugins": true, + "sort-packages": true + }, + "extra": { + "composer-exit-on-patch-failure": false, + "drupal-scaffold": { + "locations": { + "web-root": "web" + } + }, + "installer-paths": { + "web/core": [ + "type:drupal-core" + ], + "web/libraries/{$name}": [ + "type:drupal-library", + "type:npm-asset", + "type:bower-asset" + ], + "web/modules/contrib/{$name}": [ + "type:drupal-module" + ], + "web/profiles/contrib/{$name}": [ + "type:drupal-profile" + ], + "web/themes/contrib/{$name}": [ + "type:drupal-theme" + ], + "web/drush/Commands/contrib/{$name}": [ + "type:drupal-drush" + ], + "web/modules/custom/{$name}": [ + "type:drupal-custom-module" + ], + "web/themes/custom/{$name}": [ + "type:drupal-custom-theme" + ] + }, + "installer-types": [ + "bower-asset", + "npm-asset" + ], + "patches": { + "goalgorilla/open_social": { + "https://dgo.to/3418029 | Using var in strings is deprecated": "https://git.drupalcode.org/project/social/-/merge_requests/67.patch", + "https://dgo.to/3068284 | Social groups requires the socialblue theme and breaks some functionalities with a cloned theme": "https://git.drupalcode.org/project/social/-/merge_requests/74.patch" + }, + "drupal/group": { + "https://dgo.to/3349565 | Deprecated function: Use of static in callables is deprecated - triggered when adding user to group": "https://www.drupal.org/files/issues/2023-07-25/3349565-6.patch" + } + } + }, + "repositories": [ + { + "type": "composer", + "url": "https://packages.drupal.org/8" + }, + { + "type": "composer", + "url": "https://asset-packagist.org" + } + ], + "minimum-stability": "dev" +} \ No newline at end of file diff --git a/images/10x/openlucius/Dockerfile b/images/10x/openlucius/Dockerfile index 6d87cd0..594ed71 100644 --- a/images/10x/openlucius/Dockerfile +++ b/images/10x/openlucius/Dockerfile @@ -12,6 +12,8 @@ RUN rm -rf /opt/drupal/ RUN COMPOSER=composer.json composer create-project lucius-digital/openlucius-project:2.0.0-beta1 /opt/drupal/ \ --dev --quiet --no-ansi --no-interaction --no-progress +RUN COMPOSER=composer.json composer require drush/drush \ + --dev --quiet --no-ansi --no-interaction --no-progress \ # Install Drupal RUN bash /opt/install.sh