Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 35 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,41 @@
[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

- STAC API: Security update and minor OpenAPI version reporting fixes
using version [2.2.0](https://github.com/crim-ca/stac-app/releases/tag/2.2.0)
(relates to [crim-ca/stac-app#65](https://github.com/crim-ca/stac-app/pull/65)
and [crim-ca/stac-app#69](https://github.com/crim-ca/stac-app/pull/69)).

- Weaver: Security update using version [6.8.1](https://github.com/crim-ca/weaver/releases/tag/6.8.1)
(relates to [crim-ca/weaver#868](https://github.com/crim-ca/weaver/pull/868)
and [crim-ca/weaver#869](https://github.com/crim-ca/weaver/pull/869)).

- Cowbird: Security update using version [2.6.0](https://github.com/Ouranosinc/cowbird/releases/tag/2.6.0)
(relates to [Ouranosinc/cowbird#98](https://github.com/Ouranosinc/cowbird/pull/98)).

- Magpie: Security update using version [4.3.1](https://github.com/Ouranosinc/Magpie/releases/tag/4.3.1)
(relates to [Ouranosinc/Magpie#640](https://github.com/Ouranosinc/Magpie/pull/640)
and [Ouranosinc/Magpie#642](https://github.com/Ouranosinc/Magpie/pull/642)).

- Twitcher: Security update using version [0.11.0](https://github.com/bird-house/twitcher/releases/tag/v0.11.0)
(relates to [bird-house/twitcher#143](https://github.com/bird-house/twitcher/pull/143),
[bird-house/twitcher#145](https://github.com/bird-house/twitcher/pull/145),
[bird-house/twitcher#146](https://github.com/bird-house/twitcher/pull/146) and
[bird-house/twitcher#148](https://github.com/bird-house/twitcher/pull/148)).

- Weaver: Update `post-docker-compose-up` script.
- Handle multiple Magpie cookies in response.
This can happen depending on specific internal HTTP libraries versions of the services.
To retain backward/forward compatibility, all cookies returned from Magpie are chained in following `curl` commands.
- Use birdhouse `log` utility to report operations produced by the script rather than custom "echo level".

- Birdhouse: Allow `log <LEVEL> -n ...` and `log <LEVEL> -p ...` to generate log outputs without newline/prefixes.

These options allow writing multiple log entries onto the same line for correct visual rendering of distinct `log`
calls separated to allow some intermediate logic. The `log` function invocations with these options respect the
log levels in order to make the messages consistent with enabled redirections and verbosity.

[2.20.4](https://github.com/bird-house/birdhouse-deploy/tree/2.20.4) (2026-01-16)
------------------------------------------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion bin/birdhouse
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ print_config_command() {
}

print_log_command() {
echo ". ${COMPOSE_DIR}/scripts/logging.include.sh"
echo "export __BIRDHOUSE_SUPPORTED_INTERFACE=True ; . ${COMPOSE_DIR}/scripts/logging.include.sh"
}

# Support multiple short flags together (ex: -abc instead of -a -b -c)
Expand Down
2 changes: 1 addition & 1 deletion birdhouse/components/cowbird/default.env
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ VARS="$VARS $EXTRA_VARS"
# Cowbird Configuration
# =====================

export COWBIRD_VERSION="2.5.2"
export COWBIRD_VERSION="2.6.0"
export COWBIRD_DOCKER=pavics/cowbird
export COWBIRD_IMAGE='${COWBIRD_DOCKER}:${COWBIRD_VERSION}'
export COWBIRD_IMAGE_API='${COWBIRD_IMAGE}-webservice'
Expand Down
2 changes: 1 addition & 1 deletion birdhouse/components/magpie/default.env
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# are applied and must be added to the list of DELAYED_EVAL.

# Tag version that will be used to update Magpie API, Magpie CLI, and matching Twitcher with Magpie Adapter
export MAGPIE_VERSION=4.2.0
export MAGPIE_VERSION=4.3.1
export MAGPIE_IMAGE='pavics/magpie:${MAGPIE_VERSION}'
export MAGPIE_IMAGE_URI='registry.hub.docker.com/${MAGPIE_IMAGE}'

Expand Down
4 changes: 2 additions & 2 deletions birdhouse/components/stac/default.env
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ export STAC_PGPASSWORD='${BIRDHOUSE_POSTGRES_PASSWORD}'
# crim-ca/stac-app:1.0.0 uses STAC-fastapi version 3.0.3 with pgstac 0.6.10 (techically >=0.7,<0.8, but 0.6 works)
# crim-ca/stac-app:1.1.0 uses STAC-fastapi version 5.2.0 with pgstac 0.9.6 (techically >=0.8,<0.10)
# crim-ca/stac-app:2.0.1 uses STAC-fastapi version 6.0.0 with pgstac 0.9.6+ (techically >=0.8,<0.10)
export STAC_VERSION=6.0.0-crim-2.1.0
export STAC_IMAGE='ghcr.io/crim-ca/stac-app:2.1.0'
export STAC_VERSION=6.0.0-crim-2.2.0
export STAC_IMAGE='ghcr.io/crim-ca/stac-app:2.2.0'
export STAC_IMAGE_URI='${STAC_IMAGE}'
export STAC_LICENSE_URL='https://raw.githubusercontent.com/crim-ca/stac-app/refs/heads/main/LICENSE'
export STAC_OPENAPI_SPEC_PATH='/api'
Expand Down
2 changes: 1 addition & 1 deletion birdhouse/components/twitcher/default.env
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# This is because Twitcher must be built with the MagpieAdapter component.
# (https://github.com/Ouranosinc/Magpie/blob/master/Dockerfile.adapter)
# The following reference is only indicative for the 'service-config.json'.
export TWITCHER_VERSION=0.10.0
export TWITCHER_VERSION=0.11.1
export TWITCHER_RELEASE='${TWITCHER_VERSION}-magpie-${MAGPIE_VERSION}'
export TWITCHER_DOCKER=pavics/twitcher
export TWITCHER_IMAGE='${TWITCHER_DOCKER}:magpie-${MAGPIE_VERSION}'
Expand Down
2 changes: 1 addition & 1 deletion birdhouse/components/weaver/default.env
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ OPTIONAL_VARS="
export WEAVER_CONFIG=HYBRID

# default release version that will be used to fetch docker images (API mananger & celery workers services)
export WEAVER_VERSION=6.6.2
export WEAVER_VERSION=6.8.1
export WEAVER_DOCKER=pavics/weaver
export WEAVER_IMAGE='${WEAVER_DOCKER}:${WEAVER_VERSION}'
export WEAVER_MANAGER_IMAGE='${WEAVER_IMAGE}-manager'
Expand Down
Loading