diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 7528423fd..50bd4734f 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.6.2 +current_version = 2.6.3 commit = True tag = False tag_name = {new_version} @@ -30,11 +30,11 @@ search = {current_version} replace = {new_version} [bumpversion:file:RELEASE.txt] -search = {current_version} 2024-12-03T20:46:32Z +search = {current_version} 2024-12-05T23:54:48Z replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ} [bumpversion:part:releaseTime] -values = 2024-12-03T20:46:32Z +values = 2024-12-05T23:54:48Z [bumpversion:file(version):birdhouse/components/canarie-api/docker_configuration.py.template] search = 'version': '{current_version}' diff --git a/CHANGES.md b/CHANGES.md index 74f7fd58b..5c0eba928 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -17,6 +17,16 @@ [//]: # (list changes here, using '-' for each new entry, remove this when items are added) +[2.6.3](https://github.com/bird-house/birdhouse-deploy/tree/2.6.3) (2024-12-05) +------------------------------------------------------------------------------------------------------------------ + +## Changes + +- Update Thredds to supported version + + Unidata has dropped support for TDS versions < 5.x. This updates Thredds to version 5.5. + + [2.6.2](https://github.com/bird-house/birdhouse-deploy/tree/2.6.2) (2024-12-03) ------------------------------------------------------------------------------------------------------------------ diff --git a/Makefile b/Makefile index 7688c675e..1fa26a23a 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Generic variables override SHELL := bash override APP_NAME := birdhouse-deploy -override APP_VERSION := 2.6.2 +override APP_VERSION := 2.6.3 # utility to remove comments after value of an option variable override clean_opt = $(shell echo "$(1)" | $(_SED) -r -e "s/[ '$'\t'']+$$//g") diff --git a/README.rst b/README.rst index 823356583..e3df4e230 100644 --- a/README.rst +++ b/README.rst @@ -18,13 +18,13 @@ for a full-fledged production platform. * - citation - | |citation| -.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.6.2.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.6.3.svg :alt: Commits since latest release - :target: https://github.com/bird-house/birdhouse-deploy/compare/2.6.2...master + :target: https://github.com/bird-house/birdhouse-deploy/compare/2.6.3...master -.. |latest-version| image:: https://img.shields.io/badge/tag-2.6.2-blue.svg?style=flat +.. |latest-version| image:: https://img.shields.io/badge/tag-2.6.3-blue.svg?style=flat :alt: Latest Tag - :target: https://github.com/bird-house/birdhouse-deploy/tree/2.6.2 + :target: https://github.com/bird-house/birdhouse-deploy/tree/2.6.3 .. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest :alt: ReadTheDocs Build Status (latest version) diff --git a/RELEASE.txt b/RELEASE.txt index 3157852a9..a4342d060 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1 +1 @@ -2.6.2 2024-12-03T20:46:32Z +2.6.3 2024-12-05T23:54:48Z diff --git a/birdhouse/components/canarie-api/docker_configuration.py.template b/birdhouse/components/canarie-api/docker_configuration.py.template index 0e9a3cbc0..f4b726751 100644 --- a/birdhouse/components/canarie-api/docker_configuration.py.template +++ b/birdhouse/components/canarie-api/docker_configuration.py.template @@ -108,8 +108,8 @@ SERVICES = { # NOTE: # Below version and release time auto-managed by 'make VERSION=x.y.z bump'. # Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'. - 'version': '2.6.2', - 'releaseTime': '2024-12-03T20:46:32Z', + 'version': '2.6.3', + 'releaseTime': '2024-12-05T23:54:48Z', 'institution': '${BIRDHOUSE_INSTITUTION}', 'researchSubject': '${BIRDHOUSE_SUBJECT}', 'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}', @@ -141,8 +141,8 @@ PLATFORMS = { # NOTE: # Below version and release time auto-managed by 'make VERSION=x.y.z bump'. # Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'. - 'version': '2.6.2', - 'releaseTime': '2024-12-03T20:46:32Z', + 'version': '2.6.3', + 'releaseTime': '2024-12-05T23:54:48Z', 'institution': '${BIRDHOUSE_INSTITUTION}', 'researchSubject': '${BIRDHOUSE_SUBJECT}', 'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}', diff --git a/birdhouse/components/thredds/catalog.xml.template b/birdhouse/components/thredds/catalog.xml.template index f7979d9b3..5c76570c5 100644 --- a/birdhouse/components/thredds/catalog.xml.template +++ b/birdhouse/components/thredds/catalog.xml.template @@ -11,7 +11,8 @@ - + + diff --git a/birdhouse/components/thredds/config/canarie-api/canarie_api_monitoring.py.template b/birdhouse/components/thredds/config/canarie-api/canarie_api_monitoring.py.template index f0357e880..2ba78d1b6 100644 --- a/birdhouse/components/thredds/config/canarie-api/canarie_api_monitoring.py.template +++ b/birdhouse/components/thredds/config/canarie-api/canarie_api_monitoring.py.template @@ -40,7 +40,7 @@ SERVICES['Thredds'] = { 'name': 'Thredds', 'synopsis': 'Climate Data Catalog and Format Renderers', 'version': "${THREDDS_VERSION}", - 'releaseTime': get_release_time_from_repo_tag("docker", "${THREDDS_DOCKER}", "${THREDDS_VERSION}"), + 'releaseTime': get_release_time_from_repo_tag("docker", "${THREDDS_DOCKER}", "${THREDDS_TAGGED}"), 'institution': 'Ouranos', 'researchSubject': 'Catalog', 'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}', diff --git a/birdhouse/components/thredds/default.env b/birdhouse/components/thredds/default.env index 9af3f0204..ff97522d2 100644 --- a/birdhouse/components/thredds/default.env +++ b/birdhouse/components/thredds/default.env @@ -1,9 +1,10 @@ # 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_TAGGED="5.5-unidata-2024-11-19-with-tds-plugin-jar-with-dependencies.jar" +export THREDDS_VERSION="5.5.0-unidata-2024-11-19" export THREDDS_DOCKER=pavics/thredds-docker -export THREDDS_IMAGE='${THREDDS_DOCKER}:${THREDDS_VERSION}' +export THREDDS_IMAGE='${THREDDS_DOCKER}:${THREDDS_TAGGED}' export THREDDS_IMAGE_URI='registry.hub.docker.com/${THREDDS_IMAGE}' export THREDDS_ORGANIZATION="Birdhouse" export THREDDS_ADDITIONAL_CATALOG="" @@ -54,6 +55,7 @@ OPTIONAL_VARS=" \$THREDDS_ORGANIZATION \$TWITCHER_PROTECTED_PATH \$THREDDS_DOCKER + \$THREDDS_TAGGED \$THREDDS_VERSION \$THREDDS_IMAGE \$THREDDS_IMAGE_URI 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