Skip to content

Commit 6454f78

Browse files
authored
Merge pull request #113 from govCMS/release/3.6.0
Prep 3.6.0 release.
2 parents 1e291b6 + 36e5504 commit 6454f78

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
# e.g. site audits, automated backups.
66
version: {{ GOVCMS_VERSION }}
77
type: {{ GOVCMS_TYPE }}
8-
scaffold: 3.5.0
8+
scaffold: 3.6.0

composer.10.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323
"minimum-stability": "dev",
2424
"prefer-stable": true,
2525
"config": {
26-
"platform": {
27-
"php": "8.1"
28-
},
2926
"sort-packages": true,
3027
"allow-plugins": {
3128
"composer/installers": true,
@@ -36,7 +33,8 @@
3633
"oomphinc/composer-installers-extender": true,
3734
"phpstan/extension-installer": true,
3835
"php-http/discovery": true,
39-
"simplesamlphp/composer-module-installer": true
36+
"simplesamlphp/composer-module-installer": true,
37+
"tbachert/spi": true
4038
}
4139
},
4240
"autoload": {

docker-compose.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ x-volumes-paas: &paas-volumes
2424
- .:/app:delegated
2525

2626
x-environment: &default-environment
27+
RESTY_RESOLVER: 8.8.8.8
2728
STAGE_FILE_PROXY_URL: ${STAGE_FILE_PROXY_URL:-}
2829
LAGOON_ENVIRONMENT_TYPE: ${LAGOON_ENVIRONMENT_TYPE:-}
2930
LAGOON_PROJECT: *lagoon-project
@@ -37,8 +38,9 @@ x-environment: &default-environment
3738
DRUPAL_SHIELD_PASS: ${DRUPAL_SHIELD_PASS:-}
3839
GOVCMS_DEPLOY_WORKFLOW_CONFIG: ${GOVCMS_DEPLOY_WORKFLOW_CONFIG:-import}
3940
GOVCMS_PREPARE_XML_SCRIPT: /app/vendor/bin/govcms-prepare-xml
40-
CLAMAV_HOST: av
41-
CLAMAV_MODE: daemon
41+
HTTPAV_ENDPOINT: http://av:3993/scan
42+
HTTPAV_RETURN_KEY: comodo
43+
HTTP_PAYLOAD_KEY: malware
4244

4345
services:
4446

0 commit comments

Comments
 (0)