Merge pull request #124 from govCMS/release/3.7.0

Release 3.7.0

Author: steveworley

.ahoy.yml

@@ -126,7 +126,7 @@ commands:
   ship-shape:
     usage: Run site validation scripts locally
     cmd: |
-      docker compose exec -T cli shipshape -f /app/vendor/govcms/scaffold-tooling/shipshape.yml --exclude-db --error-code "$@"
+      docker compose exec -T cli shipshape run -f /app/vendor/govcms/scaffold-tooling/shipshape.yml --exclude-db --error-code . "$@"
 
   debug:
     usage: Enable debug configuration.

.lagoon.yml

@@ -45,7 +45,7 @@ tasks:
     ## START SaaS-only
     - run:
         name: Perform GovCMS platform validations
-        command: 'shipshape -f /app/vendor/govcms/scaffold-tooling/shipshape.yml --exclude-db --error-code'
+        command: 'shipshape run -f /app/vendor/govcms/scaffold-tooling/shipshape.yml --exclude-db --error-code .'
         service: cli
         shell: bash
         when: withDefault("GOVCMS_SKIP_AUDIT", false) == false

.version.yml

@@ -5,4 +5,4 @@
 # e.g. site audits, automated backups.
 version: {{ GOVCMS_VERSION }}
 type: {{ GOVCMS_TYPE }}
-scaffold: 3.6.0
+scaffold: 3.7.0

composer.10.json

@@ -33,7 +33,8 @@
             "oomphinc/composer-installers-extender": true,
             "phpstan/extension-installer": true,
             "php-http/discovery": true,
-            "simplesamlphp/composer-module-installer": true,
+            "simplesamlphp/composer-module-installer": false,
+            "simplesamlphp/composer-xmlprovider-installer": false,
             "tbachert/spi": true
         }
     },

docker-compose.yml

@@ -58,6 +58,7 @@ services:
       lagoon.type: cli-persistent
       lagoon.persistent.name: nginx
       lagoon.persistent: /app/web/sites/default/files/
+      lagoon.base.image: govcms/govcms:${GOVCMS_IMAGE_VERSION:-10.x-latest}
     << : *default-volumes
     environment:
       << : *default-environment
@@ -92,6 +93,7 @@ services:
     labels:
       lagoon.type: nginx-php-persistent
       lagoon.persistent: /app/web/sites/default/files/
+      lagoon.base.image: govcms/nginx-drupal:${GOVCMS_IMAGE_VERSION:-10.x-latest}
     << : *default-volumes
     depends_on:
       - cli
@@ -113,6 +115,7 @@ services:
       lagoon.type: nginx-php-persistent
       lagoon.name: nginx
       lagoon.persistent: /app/web/sites/default/files/
+      lagoon.base.image: govcms/php:${GOVCMS_IMAGE_VERSION:-10.x-latest}
     << : *default-volumes
     depends_on:
       - cli
@@ -144,6 +147,7 @@ services:
   #       GOVCMS_IMAGE_VERSION: *govcms-image-version
   #   labels:
   #     lagoon.type: solr
+  #     lagoon.base.image: govcms/solr:${GOVCMS_IMAGE_VERSION:-10.x-latest}
   #   ports:
   #     - "8983" # Find port on host with `docker compose port solr 8983`
   #   depends_on: