From 79a95123205d8e5a28eb04a305f0f2d2b8e2e831 Mon Sep 17 00:00:00 2001
From: Philip Peterson <philip-peterson@users.noreply.github.com>
Date: Fri, 1 May 2026 04:26:46 -0700
Subject: [PATCH] Clean up requires

---
 Dockerfile    | 17 ++++++++++++++++-
 composer.json |  6 ------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ea1cc7e..0f86384 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,7 +35,22 @@ WORKDIR /var/www/html
 COPY composer.json ./
 
 RUN composer config repositories.drupal composer https://packages.drupal.org/8
-RUN composer require drupal/webform drupal/symfony_mailer --no-update
+
+## Composer requires
+
+
+# Core
+RUN composer require composer/installers:^2.3			--no-update
+RUN composer require drupal/core-recommended:^11		--no-update
+RUN composer require drupal/core-composer-scaffold:^11		--no-update
+RUN composer require drush/drush:"^13 || ^14"			--no-update
+
+# Extra
+RUN composer require drupal/webform drupal/symfony_mailer	--no-update
+
+#######
+
+
 RUN composer install --no-dev --optimize-autoloader --no-interaction
 
 # Overlay our site-specific files on top of the scaffolded web/
diff --git a/composer.json b/composer.json
index a22b726..dd36876 100644
--- a/composer.json
+++ b/composer.json
@@ -5,12 +5,6 @@
     "license": "GPL-2.0-or-later",
     "minimum-stability": "dev",
     "prefer-stable": true,
-    "require": {
-        "composer/installers": "^2.3",
-        "drupal/core-composer-scaffold": "^11",
-        "drupal/core-recommended": "^11",
-        "drush/drush": "^13 || ^14"
-    },
     "config": {
         "allow-plugins": {
             "composer/installers": true,