From 2d27b1cc346dc9daaaa04c9144a0528c1b847088 Mon Sep 17 00:00:00 2001 From: mishaschwartz <4380924+mishaschwartz@users.noreply.github.com> Date: Thu, 10 Aug 2023 16:03:47 -0400 Subject: [PATCH 1/4] quick fixes as suggested in review in #297 --- birdhouse/components/stac/docker-compose-extra.yml | 7 ------- .../proxy/conf.extra-service.d/twitcher.conf.template | 2 +- .../{ => config/magpie}/docker-compose-extra.yml | 0 3 files changed, 1 insertion(+), 8 deletions(-) rename birdhouse/optional-components/stac-public-access/{ => config/magpie}/docker-compose-extra.yml (100%) diff --git a/birdhouse/components/stac/docker-compose-extra.yml b/birdhouse/components/stac/docker-compose-extra.yml index e31263567..721a3dae8 100644 --- a/birdhouse/components/stac/docker-compose-extra.yml +++ b/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: - - ./components/stac/conf.extra-service.d:/etc/nginx/conf.extra-service.d/stac:ro - links: - - stac - volumes: stac-db: diff --git a/birdhouse/config/twitcher/config/proxy/conf.extra-service.d/twitcher.conf.template b/birdhouse/config/twitcher/config/proxy/conf.extra-service.d/twitcher.conf.template index 0fcc08a06..76f6619e0 100644 --- a/birdhouse/config/twitcher/config/proxy/conf.extra-service.d/twitcher.conf.template +++ b/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 } diff --git a/birdhouse/optional-components/stac-public-access/docker-compose-extra.yml b/birdhouse/optional-components/stac-public-access/config/magpie/docker-compose-extra.yml similarity index 100% rename from birdhouse/optional-components/stac-public-access/docker-compose-extra.yml rename to birdhouse/optional-components/stac-public-access/config/magpie/docker-compose-extra.yml From c821fc9f0146c62f70e80ab65f6e3784ef178d4e Mon Sep 17 00:00:00 2001 From: mishaschwartz <4380924+mishaschwartz@users.noreply.github.com> Date: Thu, 10 Aug 2023 16:08:26 -0400 Subject: [PATCH 2/4] update changes.md --- CHANGES.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index f3cc858d2..bc21847d9 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,7 +15,13 @@ [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 + +- Small stac changes + - This PR includes some changes that were suggested in a review for #297. But because the PR was already merged I'm including them 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) ------------------------------------------------------------------------------------------------------------------ From ae92afb9b080192922f5d9856e28d84cb1a40f8d Mon Sep 17 00:00:00 2001 From: mishaschwartz <4380924+mishaschwartz@users.noreply.github.com> Date: Tue, 15 Aug 2023 09:23:22 -0400 Subject: [PATCH 3/4] review updates --- CHANGES.md | 5 +++-- .../config/proxy/conf.extra-service.d/twitcher.conf.template | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index bc21847d9..feea439c2 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -17,8 +17,9 @@ ## Changes -- Small stac changes - - This PR includes some changes that were suggested in a review for #297. But because the PR was already merged I'm including them here: +- 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 diff --git a/birdhouse/config/twitcher/config/proxy/conf.extra-service.d/twitcher.conf.template b/birdhouse/config/twitcher/config/proxy/conf.extra-service.d/twitcher.conf.template index 76f6619e0..437fc3556 100644 --- a/birdhouse/config/twitcher/config/proxy/conf.extra-service.d/twitcher.conf.template +++ b/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_PUBLIC}"; # 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 } From 920497a94043b2444fd1fc947b27e84a9890d151 Mon Sep 17 00:00:00 2001 From: mishaschwartz <4380924+mishaschwartz@users.noreply.github.com> Date: Tue, 15 Aug 2023 13:18:59 -0400 Subject: [PATCH 4/4] =?UTF-8?q?Bump=20version:=201.29.0=20=E2=86=92=201.29?= =?UTF-8?q?.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 6 +++--- CHANGES.md | 5 +++++ Makefile | 2 +- README.rst | 8 ++++---- RELEASE.txt | 2 +- .../config/canarie-api/docker_configuration.py.template | 8 ++++---- docs/source/conf.py | 4 ++-- 7 files changed, 20 insertions(+), 15 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 95d383ec7..715f465f0 100644 --- a/.bumpversion.cfg +++ b/.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}' diff --git a/CHANGES.md b/CHANGES.md index feea439c2..d8b8dc6f2 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,6 +15,11 @@ [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) + +[1.29.1](https://github.com/bird-house/birdhouse-deploy/tree/1.29.1) (2023-08-15) +------------------------------------------------------------------------------------------------------------------ + ## Changes - Small STAC changes diff --git a/Makefile b/Makefile index 4d2b4b729..f6471e0d6 100644 --- a/Makefile +++ b/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") diff --git a/README.rst b/README.rst index 79687c474..ef525c26a 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.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) diff --git a/RELEASE.txt b/RELEASE.txt index e8d54f0c0..0aaa66fe0 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1 +1 @@ -1.29.0 2023-08-10T19:38:10Z +1.29.1 2023-08-15T17:18:59Z diff --git a/birdhouse/config/canarie-api/docker_configuration.py.template b/birdhouse/config/canarie-api/docker_configuration.py.template index 0dcd5b145..5d9252b01 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.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}', diff --git a/docs/source/conf.py b/docs/source/conf.py index 0353964d0..498a25038 100644 --- a/docs/source/conf.py +++ b/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.