Fix disapearing Thredds docker image 4.6.18 (#313)

## Overview

The current docker image version for thredds (4.6.18) is no longer
hosted in the [Unidata docker
repository](https://hub.docker.com/r/unidata/thredds-docker/tags).

Pushed the same image from Ouranos production to PAVICS DockerHub,
restoring
  the missing Thredds image.

Discovered that Unidata is also not keeping their tag immutable, like
Kartoza Geoserver image.

So Ouranos tag has the approximate month of Unidata re-release of
4.6.18.

  On our production server:
  ```
  $ docker images |grep thredds|grep 4.6.18
unidata/thredds-docker 4.6.18 25997a1b2893 15 months ago 5.63GB
  ```

  On our staging server:
  ```
  $ docker images |grep thredds | grep 4.6.18
unidata/thredds-docker 4.6.18 09103737360a 16 months ago 5.62GB
  ```

## Changes

**Non-breaking changes**

- Restore the same Thredds docker image as the one on Ouranos production

## Related Issue / Discussion

## Additional Information

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.25.4
+current_version = 1.25.5
 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} 2023-04-12T22:02:31Z
+search = {current_version} 2023-04-12T22:50:31Z
 replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ}
 
 [bumpversion:part:releaseTime]
-values = 2023-04-12T22:02:31Z
+values = 2023-04-12T22:50:31Z
 
 [bumpversion:file(version):birdhouse/config/canarie-api/docker_configuration.py.template]
 search = 'version': '{current_version}'

CHANGES.md

@@ -17,6 +17,36 @@
 
 [//]: # (list changes here, using '-' for each new entry, remove this when items are added)
 
+[1.25.5](https://github.com/bird-house/birdhouse-deploy/tree/1.25.5) (2023-04-12)
+------------------------------------------------------------------------------------------------------------------
+
+## Fixes
+
+- Fix disapearing Thredds docker image
+
+  The current docker image version for thredds (4.6.18) is no longer hosted in the
+  [Unidata docker repository](https://hub.docker.com/r/unidata/thredds-docker/tags).
+
+  Pushed the same image from Ouranos production to PAVICS DockerHub, restoring
+  the missing Thredds image.
+
+  Discovered that Unidata is also not keeping their tag immutable, like Kartoza Geoserver image.
+
+  So Ouranos tag has the approximate month of Unidata re-release of 4.6.18.
+
+  On our production server:
+  ```
+  $ docker images |grep thredds|grep 4.6.18
+  unidata/thredds-docker              4.6.18              25997a1b2893   15 months ago   5.63GB
+  ```
+
+  On our staging server:
+  ```
+  $ docker images |grep thredds | grep 4.6.18
+  unidata/thredds-docker              4.6.18              09103737360a   16 months ago   5.62GB
+  ```
+
+
 [1.25.4](https://github.com/bird-house/birdhouse-deploy/tree/1.25.4) (2023-04-12)
 ------------------------------------------------------------------------------------------------------------------
 

Makefile

@@ -1,7 +1,7 @@
 # Generic variables
 override SHELL       := bash
 override APP_NAME    := birdhouse-deploy
-override APP_VERSION := 1.25.4
+override APP_VERSION := 1.25.5
 
 # utility to remove comments after value of an option variable
 override clean_opt = $(shell echo "$(1)" | $(_SED) -r -e "s/[ '$'\t'']+$$//g")

README.rst

@@ -14,13 +14,13 @@ for a full-fledged production platform.
     * - releases
       - | |latest-version| |commits-since|
 
-.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.25.4.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.25.5.svg
     :alt: Commits since latest release
-    :target: https://github.com/bird-house/birdhouse-deploy/compare/1.25.4...master
+    :target: https://github.com/bird-house/birdhouse-deploy/compare/1.25.5...master
 
-.. |latest-version| image:: https://img.shields.io/badge/tag-1.25.4-blue.svg?style=flat
+.. |latest-version| image:: https://img.shields.io/badge/tag-1.25.5-blue.svg?style=flat
     :alt: Latest Tag
-    :target: https://github.com/bird-house/birdhouse-deploy/tree/1.25.4
+    :target: https://github.com/bird-house/birdhouse-deploy/tree/1.25.5
 
 .. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest
     :alt: ReadTheDocs Build Status (latest version)

RELEASE.txt

@@ -1 +1 @@
-1.25.4 2023-04-12T22:02:31Z
+1.25.5 2023-04-12T22:50:31Z

birdhouse/config/canarie-api/docker_configuration.py.template

@@ -17,8 +17,8 @@ SERVICES = {
         'info': {
             'name': 'Node',
             'synopsis': 'Nodes are data, compute and index endpoints accessed through the PAVICS platform or external clients. The Node service is the backend that allows: data storage, harvesting, indexation and discovery of local and federated data; authentication and authorization; server registration and management. Node service is therefore composed of several other services.',
-            'version': '1.25.4',
-            'releaseTime': '2023-04-12T22:02:31Z',
+            'version': '1.25.5',
+            'releaseTime': '2023-04-12T22:50:31Z',
             'institution': 'Ouranos',
             'researchSubject': 'Climatology',
             'supportEmail': '${SUPPORT_EMAIL}',
@@ -47,8 +47,8 @@ PLATFORMS = {
         'info': {
             'name': 'PAVICS',
             'synopsis': 'The PAVICS (Power Analytics for Visualization of Climate Science) platform is a collection of climate analysis services served through Open Geospatial Consortium (OGC) protocols. These services include data access, processing and visualization. Both data and algorithms can be accessed either programmatically, through OGC-compliant clients such as QGIS or ArcGIS, or a custom web interface.',
-            'version': '1.25.4',
-            'releaseTime': '2023-04-12T22:02:31Z',
+            'version': '1.25.5',
+            'releaseTime': '2023-04-12T22:50:31Z',
             'institution': 'Ouranos',
             'researchSubject': 'Climatology',
             'supportEmail': '${SUPPORT_EMAIL}',

birdhouse/config/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_IMAGE="unidata/thredds-docker:4.6.18"
+export THREDDS_IMAGE="pavics/thredds-docker:4.6.18-unidata-2022-01"
 
 export THREDDS_ORGANIZATION="Birdhouse"
 

docs/source/conf.py

@@ -69,9 +69,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.25.4'
+version = '1.25.5'
 # The full version, including alpha/beta/rc tags.
-release = '1.25.4'
+release = '1.25.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.