Merge branch 'master' into build-to-build-dir

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.29.0
+current_version = 1.29.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-08-10T19:38:10Z
+search = {current_version} 2023-08-15T17:18:59Z
 replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ}
 
 [bumpversion:part:releaseTime]
-values = 2023-08-10T19:38:10Z
+values = 2023-08-15T17:18:59Z
 
 [bumpversion:file(version):birdhouse/config/canarie-api/docker_configuration.py.template]
 search = 'version': '{current_version}'

CHANGES.md

@@ -32,6 +32,18 @@
     - now, they are absolute or relative paths from the parent of the component's directory (this resolves to the build
       directory when the stack is started up).
 
+[1.29.1](https://github.com/bird-house/birdhouse-deploy/tree/1.29.1) (2023-08-15)
+------------------------------------------------------------------------------------------------------------------
+
+## Changes
+
+- Small STAC changes
+  - This PR includes some changes that were suggested in a review for #297. But because the PR was already merged,
+    further updates are included here:
+    - removes extra block to include in docker compose files (no longer needed)
+    - moves docker compose file in `stac-public-access` component to the correct location
+    - uses `PAVICS_FQDN_PUBLIC` for public facing URLs in all places
+
 [1.29.0](https://github.com/bird-house/birdhouse-deploy/tree/1.29.0) (2023-08-10)
 ------------------------------------------------------------------------------------------------------------------
 

Makefile

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

RELEASE.txt

@@ -1 +1 @@
-1.29.0 2023-08-10T19:38:10Z
+1.29.1 2023-08-15T17:18:59Z

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

@@ -52,12 +52,5 @@ services:
       timeout: 5s
       retries: 5
 
-  # extend proxy with endpoint and config for STAC API access
-  proxy:
-    volumes:
-      - ./stac/conf.extra-service.d:/etc/nginx/conf.extra-service.d/stac:ro
-    links:
-      - stac
-
 volumes:
   stac-db:

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.29.0',
-            'releaseTime': '2023-08-10T19:38:10Z',
+            'version': '1.29.1',
+            'releaseTime': '2023-08-15T17:18:59Z',
             '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.29.0',
-            'releaseTime': '2023-08-10T19:38:10Z',
+            'version': '1.29.1',
+            'releaseTime': '2023-08-15T17:18:59Z',
             'institution': 'Ouranos',
             'researchSubject': 'Climatology',
             'supportEmail': '${SUPPORT_EMAIL}',

birdhouse/config/twitcher/config/proxy/conf.extra-service.d/twitcher.conf.template

@@ -4,5 +4,5 @@
         proxy_set_header X-Forwarded-Proto $real_scheme;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Host $host:$server_port;
-        proxy_set_header Forwarded "proto=https;host=${PAVICS_FQDN}";    # Helps the STAC component to craft URLs containing the full PAVICS_FQDN
+        proxy_set_header Forwarded "proto=https;host=${PAVICS_FQDN_PUBLIC}";    # Helps the STAC component to craft URLs containing the full PAVICS_FQDN_PUBLIC
     }

docs/source/conf.py

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