diff --git a/.bumpversion.cfg b/.bumpversion.cfg index cb845535b..1bc457f47 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.33.0 +current_version = 1.33.1 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-09-25T13:02:37Z +search = {current_version} 2023-09-25T15:46:44Z replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ} [bumpversion:part:releaseTime] -values = 2023-09-25T13:02:37Z +values = 2023-09-25T15:46:44Z [bumpversion:file(version):birdhouse/config/canarie-api/docker_configuration.py.template] search = 'version': '{current_version}' diff --git a/CHANGES.md b/CHANGES.md index da76d242b..18687b67c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -17,6 +17,15 @@ [//]: # (list changes here, using '-' for each new entry, remove this when items are added) +[1.33.1](https://github.com/bird-house/birdhouse-deploy/tree/1.33.1) (2023-09-25) +------------------------------------------------------------------------------------------------------------------ + +## Fixes + +- Docker compose version missing in ``stac/config/magpie/`` compose file + - The ``version:`` key was not set in the ``stac/config/magpie/docker-compose-extra.yml`` file which caused + ``docker-compose`` to report a version mismatch and fail to start. + [1.33.0](https://github.com/bird-house/birdhouse-deploy/tree/1.33.0) (2023-09-25) ------------------------------------------------------------------------------------------------------------------ diff --git a/Makefile b/Makefile index cd37a2b7b..654070853 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Generic variables override SHELL := bash override APP_NAME := birdhouse-deploy -override APP_VERSION := 1.33.0 +override APP_VERSION := 1.33.1 # 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 e0d9ddd47..61aa8d8fb 100644 --- a/README.rst +++ b/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.33.0.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.33.1.svg :alt: Commits since latest release - :target: https://github.com/bird-house/birdhouse-deploy/compare/1.33.0...master + :target: https://github.com/bird-house/birdhouse-deploy/compare/1.33.1...master -.. |latest-version| image:: https://img.shields.io/badge/tag-1.33.0-blue.svg?style=flat +.. |latest-version| image:: https://img.shields.io/badge/tag-1.33.1-blue.svg?style=flat :alt: Latest Tag - :target: https://github.com/bird-house/birdhouse-deploy/tree/1.33.0 + :target: https://github.com/bird-house/birdhouse-deploy/tree/1.33.1 .. |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 99985762c..eec449d9b 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1 +1 @@ -1.33.0 2023-09-25T13:02:37Z +1.33.1 2023-09-25T15:46:44Z diff --git a/birdhouse/components/stac/config/magpie/docker-compose-extra.yml b/birdhouse/components/stac/config/magpie/docker-compose-extra.yml index 1a786c4dc..29cd221ea 100644 --- a/birdhouse/components/stac/config/magpie/docker-compose-extra.yml +++ b/birdhouse/components/stac/config/magpie/docker-compose-extra.yml @@ -1,3 +1,5 @@ +version: "3.4" + services: magpie: volumes: diff --git a/birdhouse/config/canarie-api/docker_configuration.py.template b/birdhouse/config/canarie-api/docker_configuration.py.template index 892f76ded..e0398de62 100644 --- a/birdhouse/config/canarie-api/docker_configuration.py.template +++ b/birdhouse/config/canarie-api/docker_configuration.py.template @@ -109,8 +109,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': '1.33.0', - 'releaseTime': '2023-09-25T13:02:37Z', + 'version': '1.33.1', + 'releaseTime': '2023-09-25T15:46:44Z', 'institution': 'Ouranos', 'researchSubject': 'Climatology', 'supportEmail': '${SUPPORT_EMAIL}', @@ -142,8 +142,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': '1.33.0', - 'releaseTime': '2023-09-25T13:02:37Z', + 'version': '1.33.1', + 'releaseTime': '2023-09-25T15:46:44Z', 'institution': 'Ouranos', 'researchSubject': 'Climatology', 'supportEmail': '${SUPPORT_EMAIL}', diff --git a/docs/source/conf.py b/docs/source/conf.py index 122121fcc..82b3516a3 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -69,9 +69,9 @@ # built documents. # # The short X.Y version. -version = '1.33.0' +version = '1.33.1' # The full version, including alpha/beta/rc tags. -release = '1.33.0' +release = '1.33.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.