Merge branch 'release/3.x/10.2.2' into 3.x-master

govCMS · Jul 1, 2024 · 0ae0ab3 · 0ae0ab3
2 parents e6aeed0 + 5c65cbf
commit 0ae0ab3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.docker/images/nginx/helpers/203-expires.conf b/.docker/images/nginx/helpers/203-expires.conf
@@ -1,5 +1,5 @@
 # Only cache binary files for 30 minutes. These are the default allowed file extensions uploads that are not images.
-location ~* ^/sites/default/(files/(?!private/)).+\.(pdf|doc|docx|txt|xls|xlsx|csv|ppt|pptx|pps|ppsx|odt|ods|odp|mp3|mov|mp4|m4a|m4v|mpeg|avi|ogg|oga|ogv|weba|webp|webm)$ {
+location ~* ^/sites/default/(files/(?!private/)).+\.(pdf|doc|docx|txt|xls|xlsx|csv|ppt|pptx|pps|ppsx|odt|ods|odp|mp3|mov|mp4|m4a|m4v|mpeg|avi|ogg|oga|ogv|weba|webm)$ {
     include /etc/nginx/conf.d/drupal/location_expires_prepend*.conf;
 
     expires ${BINARY_FILES_EXPIRES:-1800s};

diff --git a/.env.default b/.env.default
@@ -35,11 +35,11 @@ X_FRAME_OPTIONS=SAMEORIGIN
 
 # Set the version of GovCMS and Drupal Core to use - you can use a tag or branch reference (3.x-dev) here
 # See https://github.com/govCMS/GovCMS/releases
-GOVCMS_PROJECT_VERSION=3.13.1
+GOVCMS_PROJECT_VERSION=3.14.0
 
 # Set the Lagoon tag to use for the upstream dockerfiles (e.g. 20.12.0)
 # See https://github.com/uselagoon/lagoon-images/releases
-LAGOON_IMAGE_VERSION=24.5.1
+LAGOON_IMAGE_VERSION=24.6.0
 
 # Set the CLI image name
 # Support both legacy (govcms8lagoon/govcms8) and newer (govcms/govcms) images.