Clean up: Make bind-mount locations more flexible (#385)

## Overview

Clean up unused variables and correct file paths from the changes made
in 1.33.2

## Changes

**Non-breaking changes**

Minor bug fix and code cleanup

**Breaking changes**

None

## Related Issue / Discussion

From suggested changes:
#356 (review)

## Additional Information

<!--
The test suite can be run using a different DACCS config with
``birdhouse_daccs_configs_branch: branch_name`` in the PR description.
To globally skip the test suite regardless of the commit message use
``birdhouse_skip_ci: true`` in the PR description.
-->

birdhouse_daccs_configs_branch: master
birdhouse_skip_ci: false

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.33.3
+current_version = 1.33.4
 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-29T17:58:48Z
+search = {current_version} 2023-10-02T13:49:23Z
 replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ}
 
 [bumpversion:part:releaseTime]
-values = 2023-09-29T17:58:48Z
+values = 2023-10-02T13:49:23Z
 
 [bumpversion:file(version):birdhouse/config/canarie-api/docker_configuration.py.template]
 search = 'version': '{current_version}'

CHANGES.md

@@ -17,6 +17,14 @@
 
 [//]: # (list changes here, using '-' for each new entry, remove this when items are added)
 
+[1.33.4](https://github.com/bird-house/birdhouse-deploy/tree/1.33.4) (2023-10-02)
+------------------------------------------------------------------------------------------------------------------
+
+# Fixes
+- Clean up: Make bind-mount locations more flexible
+
+  Clean up unused variables and correct file paths from the changes made in 1.33.2
+
 [1.33.3](https://github.com/bird-house/birdhouse-deploy/tree/1.33.3) (2023-09-29)
 ------------------------------------------------------------------------------------------------------------------
 

Makefile

@@ -1,7 +1,7 @@
 # Generic variables
 override SHELL       := bash
 override APP_NAME    := birdhouse-deploy
-override APP_VERSION := 1.33.3
+override APP_VERSION := 1.33.4
 
 # 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.33.3.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.33.4.svg
     :alt: Commits since latest release
-    :target: https://github.com/bird-house/birdhouse-deploy/compare/1.33.3...master
+    :target: https://github.com/bird-house/birdhouse-deploy/compare/1.33.4...master
 
-.. |latest-version| image:: https://img.shields.io/badge/tag-1.33.3-blue.svg?style=flat
+.. |latest-version| image:: https://img.shields.io/badge/tag-1.33.4-blue.svg?style=flat
     :alt: Latest Tag
-    :target: https://github.com/bird-house/birdhouse-deploy/tree/1.33.3
+    :target: https://github.com/bird-house/birdhouse-deploy/tree/1.33.4
 
 .. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest
     :alt: ReadTheDocs Build Status (latest version)

RELEASE.txt

@@ -1 +1 @@
-1.33.3 2023-09-29T17:58:48Z
+1.33.4 2023-10-02T13:49:23Z

birdhouse/components/weaver/default.env

@@ -103,5 +103,4 @@ export DELAYED_EVAL="
   $DELAYED_EVAL
   WEAVER_WPS_OUTPUTS_DIR
   WEAVER_MONGODB_DATA_DIR
-  WEAVER_WPS_PRIVATE_DATA_DIR
 "

birdhouse/components/weaver/docker-compose-extra.yml

@@ -96,7 +96,7 @@ services:
     networks:
       - weaver-mongodb
     volumes:
-      - ${WEAVER_MONGODB_DATA_DIR}/mongodb_weaver_persist:/data/db
+      - ${WEAVER_MONGODB_DATA_DIR}:/data/db
     restart: always
     logging: *default-logging
 

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.3',
-            'releaseTime': '2023-09-29T17:58:48Z',
+            'version': '1.33.4',
+            'releaseTime': '2023-10-02T13:49:23Z',
             '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.3',
-            'releaseTime': '2023-09-29T17:58:48Z',
+            'version': '1.33.4',
+            'releaseTime': '2023-10-02T13:49:23Z',
             'institution': 'Ouranos',
             'researchSubject': 'Climatology',
             'supportEmail': '${SUPPORT_EMAIL}',

docs/source/conf.py

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