Merge pull request #113 from govCMS/release/3.6.0

Prep 3.6.0 release.
govCMS · Oct 3, 2024 · 6454f78 · 6454f78
2 parents 1e291b6 + 36e5504
commit 6454f78
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
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.5.0
+scaffold: 3.6.0
diff --git a/composer.10.json b/composer.10.json
@@ -23,9 +23,6 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "config": {
-        "platform": {
-           "php": "8.1"
-        },
         "sort-packages": true,
         "allow-plugins": {
             "composer/installers": true,
@@ -36,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": true,
+            "tbachert/spi": true
         }
     },
     "autoload": {

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -24,6 +24,7 @@ x-volumes-paas: &paas-volumes
     - .:/app:delegated
 
 x-environment: &default-environment
+  RESTY_RESOLVER: 8.8.8.8
   STAGE_FILE_PROXY_URL: ${STAGE_FILE_PROXY_URL:-}
   LAGOON_ENVIRONMENT_TYPE: ${LAGOON_ENVIRONMENT_TYPE:-}
   LAGOON_PROJECT: *lagoon-project
@@ -37,8 +38,9 @@ x-environment: &default-environment
   DRUPAL_SHIELD_PASS: ${DRUPAL_SHIELD_PASS:-}
   GOVCMS_DEPLOY_WORKFLOW_CONFIG: ${GOVCMS_DEPLOY_WORKFLOW_CONFIG:-import}
   GOVCMS_PREPARE_XML_SCRIPT: /app/vendor/bin/govcms-prepare-xml
-  CLAMAV_HOST: av
-  CLAMAV_MODE: daemon
+  HTTPAV_ENDPOINT: http://av:3993/scan
+  HTTPAV_RETURN_KEY: comodo
+  HTTP_PAYLOAD_KEY: malware
 
 services: