Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Thredds to supported version #413

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open

Update Thredds to supported version #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
d0cbc3d
update thredds to version 5.4
mishaschwartz Dec 14, 2023
cf56f8c
thredds: update to latest version and apply WMS fix
tlvu Jan 17, 2024
32cef56
merge with master
tlvu Jan 17, 2024
9996a3c
Merge remote-tracking branch 'origin/master' into update-thredds-5.4
tlvu Feb 16, 2024
938ac18
Merge remote-tracking branch 'origin/master' into update-thredds-5.4
tlvu Feb 23, 2024
229256d
Merge remote-tracking branch 'origin/master' into update-thredds-5.4
tlvu Mar 23, 2024
e1c5b27
Merge remote-tracking branch 'origin/master' into update-thredds-5.4
tlvu Mar 25, 2024
897f972
Merge remote-tracking branch 'origin/master' into update-thredds-5.4
tlvu Apr 4, 2024
7c72500
Merge remote-tracking branch 'origin/master' into update-thredds-5.4
tlvu Apr 15, 2024
a4ea349
Merge branch 'master' into update-thredds-5.4
mishaschwartz May 1, 2024
f3264ac
add THREDDS_TAGGED variable since THREDDS_VERSION is not a proper sem…
mishaschwartz May 1, 2024
bb2d0c4
Merge branch 'master' into update-thredds-5.4
mishaschwartz May 1, 2024
014576a
Merge remote-tracking branch 'origin/master' into update-thredds-5.4
tlvu Sep 10, 2024
70b5fe0
thredds: update to version 5.5-unidata-2024-09-10
tlvu Sep 10, 2024
8df5da1
Merge remote-tracking branch 'origin/master' into update-thredds-5.4
tlvu Sep 17, 2024
439789f
Merge remote-tracking branch 'origin/master' into update-thredds-5.4
tlvu Oct 1, 2024
e6e4512
Merge remote-tracking branch 'origin/master' into update-thredds-5.4
tlvu Nov 19, 2024
f231535
thredds: update NCSS NetcdfSubset service config for v5
tlvu Nov 20, 2024
3bde344
thredds: use v5.5 with missing jar
tlvu Nov 21, 2024
154caf5
treat new service paths as path-prefixes in magpie
mishaschwartz Nov 21, 2024
e2ec935
Revert "treat new service paths as path-prefixes in magpie"
mishaschwartz Nov 21, 2024
bafcafc
testhredds: wrong context-root variable
tlvu Nov 22, 2024
936a8ee
testthredds: fix typo in catalog.xml in previous commit
tlvu Nov 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,12 @@
[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.5.


[2.6.0](https://github.com/bird-house/birdhouse-deploy/tree/2.6.0) (2024-11-19)
------------------------------------------------------------------------------------------------------------------
Expand Down
3 changes: 2 additions & 1 deletion birdhouse/components/thredds/catalog.xml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
<service name="iso" serviceType="ISO" base="${TWITCHER_PROTECTED_PATH}/thredds/iso/"/>
<service name="wcs" serviceType="WCS" base="${TWITCHER_PROTECTED_PATH}/thredds/wcs/" />
<service name="wms" serviceType="WMS" base="${TWITCHER_PROTECTED_PATH}/thredds/wms/" />
<service name="subsetServer" serviceType="NetcdfSubset" base="${TWITCHER_PROTECTED_PATH}/thredds/ncss/" />
<service name="ncssGrid" serviceType="NetcdfSubset" base="${TWITCHER_PROTECTED_PATH}/thredds/ncss/grid/" />
<service name="ncssPoint" serviceType="NetcdfSubset" base="${TWITCHER_PROTECTED_PATH}/thredds/ncss/point/" />
</service>

<datasetScan name="${THREDDS_SERVICE_DATA_LOCATION_NAME}" ID="${THREDDS_SERVICE_DATA_URL_PATH}" path="${THREDDS_SERVICE_DATA_URL_PATH}" location="${THREDDS_SERVICE_DATA_LOCATION_ON_CONTAINER}">
Expand Down
2 changes: 1 addition & 1 deletion birdhouse/components/thredds/config/canarie-api/canarie_api_monitoring.py.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}',
Expand Down
6 changes: 4 additions & 2 deletions birdhouse/components/thredds/default.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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=""
Expand Down Expand Up @@ -54,6 +55,7 @@ OPTIONAL_VARS="
\$THREDDS_ORGANIZATION
\$TWITCHER_PROTECTED_PATH
\$THREDDS_DOCKER
\$THREDDS_TAGGED
\$THREDDS_VERSION
\$THREDDS_IMAGE
\$THREDDS_IMAGE_URI
Expand Down
2 changes: 1 addition & 1 deletion birdhouse/components/thredds/threddsConfig.xml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ https://www.unidata.ucar.edu/software/tds/current/reference/ThreddsConfigXMLFile
</NCISO>

<!--
https://www.unidata.ucar.edu/software/tds/current/reference/ThreddsConfigXMLFile.html#DiskCache
https://docs.unidata.ucar.edu/tds/current/userguide/tds_config_ref.html#cdm-library-disk-cache

These elements control where the CDM/NetCDF-Java library writes temporary
files, for example when it needs to unzip files, or write GRIB index files,
Expand Down
2 changes: 1 addition & 1 deletion birdhouse/components/thredds/wmsConfig.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE wmsConfig SYSTEM "http://www.unidata.ucar.edu/schemas/thredds/dtd/ncwms/wmsConfig.dtd">
<!DOCTYPE wmsConfig SYSTEM "https://schemas.unidata.ucar.edu/thredds/dtd/ncwms/wmsConfig.dtd">
<!--
Detailed configuration of the WMS service. This config file can be used to
set default styling parameters for each dataset/variable, and to enable or disable
Expand Down
3 changes: 2 additions & 1 deletion birdhouse/optional-components/testthredds/catalog.xml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
<service name="iso" serviceType="ISO" base="/${TESTTHREDDS_CONTEXT_ROOT}/iso/"/>
<service name="wcs" serviceType="WCS" base="/${TESTTHREDDS_CONTEXT_ROOT}/wcs/" />
<service name="wms" serviceType="WMS" base="/${TESTTHREDDS_CONTEXT_ROOT}/wms/" />
<service name="subsetServer" serviceType="NetcdfSubset" base="/${TESTTHREDDS_CONTEXT_ROOT}/ncss/" />
<service name="ncssGrid" serviceType="NetcdfSubset" base="/${TESTTHREDDS_CONTEXT_ROOT}/ncss/grid/" />
<service name="ncssPoint" serviceType="NetcdfSubset" base="/${TESTTHREDDS_CONTEXT_ROOT}/ncss/point/" />
</service>

<datasetScan name="TestDatasets" ID="testdatasets" path="testdatasets" location="/birdhouse-testdata">
Expand Down
2 changes: 1 addition & 1 deletion birdhouse/optional-components/testthredds/wmsConfig.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE wmsConfig SYSTEM "http://www.unidata.ucar.edu/schemas/thredds/dtd/ncwms/wmsConfig.dtd">
<!DOCTYPE wmsConfig SYSTEM "https://schemas.unidata.ucar.edu/thredds/dtd/ncwms/wmsConfig.dtd">
<!--
Detailed configuration of the WMS service. This config file can be used to
set default styling parameters for each dataset/variable, and to enable or disable
Expand Down
Loading