Merge pull request #88 from govCMS/release/3.3.0

Release 3.3.0: Preparation for Drupal 10.2
govCMS · May 14, 2024 · 6fabe81 · 6fabe81
2 parents 11dbbcd + dfc8565
commit 6fabe81
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 23 deletions.
diff --git a/.ahoy.yml b/.ahoy.yml
@@ -132,7 +132,7 @@ commands:
     usage: Enable debug configuration.
     cmd: |
       { ahoy run "php -v|grep -q Xdebug" && echo "Debug is already enabled"; } \
-      || { export XDEBUG_ENABLE="true" && ahoy up cli test php && ahoy run "php -v|grep -q Xdebug" && echo "Enabled debug configuration. Use 'ahoy up' to disable."; }
+      || { export XDEBUG_ENABLE="true" && ahoy up cli test php nginx && ahoy run "php -v|grep -q Xdebug" && echo "Enabled debug configuration. Use 'ahoy up' to disable."; }
 
   info:
     usage: Print information about this project.

diff --git a/.docker/Dockerfile.paas b/.docker/Dockerfile.paas
@@ -5,9 +5,6 @@
 ARG CLI_IMAGE
 ARG GOVCMS_IMAGE_VERSION={{ GOVCMS_VERSION }}.x-latest
 
-# Keep the base so we can copy modules from it at the end.
-FROM govcms/govcms:${GOVCMS_IMAGE_VERSION} as base
-
 FROM govcms/govcms:${GOVCMS_IMAGE_VERSION}
 
 ARG GOVCMS_GITHUB_TOKEN
@@ -39,8 +36,6 @@ COPY .docker/config/cli/govcms.site.yml /app/drush/sites/
 RUN rm -Rf /home/.composer/vendor/bin
 ENV PATH="/app/vendor/bin:${PATH}"
 
-COPY --from=base /app/web/sites/all/modules/ /app/web/sites/all/modules/
-
 # Sanitize the Drupal install to remove potentially
 # harmful files from the built image.
 COPY .docker/scripts/sanitize.sh /tmp/sanitize.sh

diff --git a/.version.yml b/.version.yml
@@ -5,4 +5,4 @@
 # e.g. site audits, automated backups.
 version: {{ GOVCMS_VERSION }}
 type: {{ GOVCMS_TYPE }}
-scaffold: 3.0.1
+scaffold: 3.3.0
diff --git a/composer.10.json b/composer.10.json
@@ -7,28 +7,15 @@
         { "type": "path", "url": "custom/composer" },
         { "type": "composer", "url": "https://packages.drupal.org/8" },
         { "type": "composer", "url": "https://asset-packagist.org" },
-        { "type": "vcs", "url": "git@github.com:govcms/govcms.git" },
-        {
-            "type": "package",
-            "package": {
-                "name": "dropzone/dropzone",
-                "version": "v5.7.2",
-                "type": "drupal-library",
-                "dist": {
-                    "type": "zip",
-                    "url": "https://github.com/dropzone/dropzone/archive/refs/tags/v5.7.2.zip"
-                }
-            }
-        }
+        { "type": "vcs", "url": "git@github.com:govcms/govcms.git" }
     ],
     "require": {
         "php": "^8.1",
         "govcms/govcms-custom": "*",
         "govcms/govcms": "3.x-master-dev",
         "govcms/scaffold-tooling": "10.x-master-dev",
         "drush/drush": "^12",
-        "composer/installers": "^2.0",
-        "egulias/email-validator": "4.0.1 as 3.2.6"
+        "composer/installers": "^2.0"
     },
     "conflict": {
         "drupal/drupal": "*"
@@ -47,7 +34,8 @@
             "drupal/core-composer-scaffold": true,
             "drupal/core-project-message": true,
             "oomphinc/composer-installers-extender": true,
-            "phpstan/extension-installer": true
+            "phpstan/extension-installer": true,
+            "php-http/discovery": true
         }
     },
     "autoload": {