From d0cbc3dd7de98905a9c1951261dcd17419a0d97e Mon Sep 17 00:00:00 2001 From: mishaschwartz <4380924+mishaschwartz@users.noreply.github.com> Date: Thu, 14 Dec 2023 15:00:03 -0500 Subject: [PATCH 01/11] update thredds to version 5.4 --- CHANGES.md | 6 +++++- birdhouse/components/thredds/default.env | 2 +- birdhouse/components/thredds/threddsConfig.xml.template | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index ee8768271..bff9e9c74 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,7 +15,11 @@ [Unreleased](https://github.com/bird-house/birdhouse-deploy/tree/master) (latest) ------------------------------------------------------------------------------------------------------------------ -[//]: # (list changes here, using '-' for each new entry, remove this when items are added) +## Changes + +- Update Thredds to supported version + + Unidata has dropped support for TDS versions < 5.x. This updates Thredds to version 5.4. [2.0.1](https://github.com/bird-house/birdhouse-deploy/tree/2.0.1) (2023-12-11) ------------------------------------------------------------------------------------------------------------------ diff --git a/birdhouse/components/thredds/default.env b/birdhouse/components/thredds/default.env index 07b70a8aa..7c8c622f1 100644 --- a/birdhouse/components/thredds/default.env +++ b/birdhouse/components/thredds/default.env @@ -1,7 +1,7 @@ # All env in this default.env can be overridden by env.local. # thredds-docker >= 4.6.18 or >= 5.2 strongly recommended to avoid Log4J CVE-2021-44228. -export THREDDS_VERSION=4.6.18-unidata-2022-01 +export THREDDS_VERSION=5.4-unidata-2023-09-19 export THREDDS_DOCKER=pavics/thredds-docker export THREDDS_IMAGE="${THREDDS_DOCKER}:${THREDDS_VERSION}" export THREDDS_ORGANIZATION="Birdhouse" diff --git a/birdhouse/components/thredds/threddsConfig.xml.template b/birdhouse/components/thredds/threddsConfig.xml.template index caf3f9bdf..74f105674 100644 --- a/birdhouse/components/thredds/threddsConfig.xml.template +++ b/birdhouse/components/thredds/threddsConfig.xml.template @@ -92,7 +92,7 @@ https://www.unidata.ucar.edu/software/tds/current/reference/ThreddsConfigXMLFile