Skip to content

Commit 225f3c3

Browse files
mishaschwartzmishaschwartz
authored
Correct docker image for stac-populator optional component (#483)
## Overview This sets the docker image for the `stac-populator` component to a version that actually contains the code that is executed when `stac-populator` is called. The previous image no longer contained the relevant code. ## Changes **Non-breaking changes** - stac-populator image changed to version 0.0.0 **Breaking changes** None ## Related Issue / Discussion - Closes #482 ## Additional Information ## CI Operations <!-- 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`` set to ``true`` in the PR description. Using ``[<cmd>]`` (with the brackets) where ``<cmd> = skip ci`` in the commit message will override ``birdhouse_skip_ci`` from the PR description. Such commit command can be used to override the PR description behavior for a specific commit update. However, a commit message cannot 'force run' a PR which the description turns off the CI. To run the CI, the PR should instead be updated with a ``true`` value, and a running message can be posted in following PR comments to trigger tests once again. --> birdhouse_daccs_configs_branch: master birdhouse_skip_ci: false
2 parents 7dcbb42 + 6f9487c commit 225f3c3

File tree

9 files changed

+37
-16
lines changed

9 files changed

+37
-16
lines changed

Diff for: ‎.bumpversion.cfg

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 2.6.1
2+
current_version = 2.6.2
33
commit = True
44
tag = False
55
tag_name = {new_version}
@@ -30,11 +30,11 @@ search = {current_version}
3030
replace = {new_version}
3131

3232
[bumpversion:file:RELEASE.txt]
33-
search = {current_version} 2024-11-22T15:57:16Z
33+
search = {current_version} 2024-12-03T20:46:32Z
3434
replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ}
3535

3636
[bumpversion:part:releaseTime]
37-
values = 2024-11-22T15:57:16Z
37+
values = 2024-12-03T20:46:32Z
3838

3939
[bumpversion:file(version):birdhouse/components/canarie-api/docker_configuration.py.template]
4040
search = 'version': '{current_version}'

Diff for: ‎CHANGES.md

+12
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
[Unreleased](https://github.com/bird-house/birdhouse-deploy/tree/master) (latest)
1616
------------------------------------------------------------------------------------------------------------------
1717

18+
[//]: # (list changes here, using '-' for each new entry, remove this when items are added)
19+
20+
[2.6.2](https://github.com/bird-house/birdhouse-deploy/tree/2.6.2) (2024-12-03)
21+
------------------------------------------------------------------------------------------------------------------
22+
1823
## Changes
1924

2025
- Fix help string description for `bin/birdhouse configs` command
@@ -34,6 +39,13 @@
3439
is read-only, the second volume mount fails.
3540

3641

42+
## Fixes
43+
44+
- Correct docker image for `stac-populator` optional component
45+
46+
This sets the docker image for the `stac-populator` component to a version that actually contains the code
47+
that is executed when `stac-populator` is called. The previous image no longer contained the relevant code.
48+
3749
[2.6.1](https://github.com/bird-house/birdhouse-deploy/tree/2.6.1) (2024-11-22)
3850
------------------------------------------------------------------------------------------------------------------
3951

Diff for: ‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Generic variables
22
override SHELL := bash
33
override APP_NAME := birdhouse-deploy
4-
override APP_VERSION := 2.6.1
4+
override APP_VERSION := 2.6.2
55

66
# utility to remove comments after value of an option variable
77
override clean_opt = $(shell echo "$(1)" | $(_SED) -r -e "s/[ '$'\t'']+$$//g")

Diff for: ‎README.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ for a full-fledged production platform.
1818
* - citation
1919
- | |citation|
2020

21-
.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.6.1.svg
21+
.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.6.2.svg
2222
:alt: Commits since latest release
23-
:target: https://github.com/bird-house/birdhouse-deploy/compare/2.6.1...master
23+
:target: https://github.com/bird-house/birdhouse-deploy/compare/2.6.2...master
2424

25-
.. |latest-version| image:: https://img.shields.io/badge/tag-2.6.1-blue.svg?style=flat
25+
.. |latest-version| image:: https://img.shields.io/badge/tag-2.6.2-blue.svg?style=flat
2626
:alt: Latest Tag
27-
:target: https://github.com/bird-house/birdhouse-deploy/tree/2.6.1
27+
:target: https://github.com/bird-house/birdhouse-deploy/tree/2.6.2
2828

2929
.. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest
3030
:alt: ReadTheDocs Build Status (latest version)

Diff for: ‎RELEASE.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6.1 2024-11-22T15:57:16Z
1+
2.6.2 2024-12-03T20:46:32Z

Diff for: ‎birdhouse/components/canarie-api/docker_configuration.py.template

+4-4
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ SERVICES = {
108108
# NOTE:
109109
# Below version and release time auto-managed by 'make VERSION=x.y.z bump'.
110110
# Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'.
111-
'version': '2.6.1',
112-
'releaseTime': '2024-11-22T15:57:16Z',
111+
'version': '2.6.2',
112+
'releaseTime': '2024-12-03T20:46:32Z',
113113
'institution': '${BIRDHOUSE_INSTITUTION}',
114114
'researchSubject': '${BIRDHOUSE_SUBJECT}',
115115
'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}',
@@ -141,8 +141,8 @@ PLATFORMS = {
141141
# NOTE:
142142
# Below version and release time auto-managed by 'make VERSION=x.y.z bump'.
143143
# Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'.
144-
'version': '2.6.1',
145-
'releaseTime': '2024-11-22T15:57:16Z',
144+
'version': '2.6.2',
145+
'releaseTime': '2024-12-03T20:46:32Z',
146146
'institution': '${BIRDHOUSE_INSTITUTION}',
147147
'researchSubject': '${BIRDHOUSE_SUBJECT}',
148148
'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}',

Diff for: ‎birdhouse/optional-components/stac-populator/default.env

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
export STAC_POPULATOR_DOCKER=ghcr.io/crim-ca/stac-populator
2+
export STAC_POPULATOR_VERSION=0.0.0
3+
export STAC_POPULATOR_IMAGE='${STAC_POPULATOR_DOCKER}:${STAC_POPULATOR_VERSION}'
4+
15
export STAC_ASSET_GENERATOR_TIMEOUT=200
26

37
# add any new variables not already in 'VARS' or 'OPTIONAL_VARS' that must be replaced in templates here
@@ -13,3 +17,8 @@ VARS="$VARS $EXTRA_VARS"
1317
COMPONENT_DEPENDENCIES="
1418
./components/stac
1519
"
20+
21+
export DELAYED_EVAL="
22+
$DELAYED_EVAL
23+
STAC_POPULATOR_IMAGE
24+
"

Diff for: ‎birdhouse/optional-components/stac-populator/docker-compose-extra.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ services:
1111
# populates STAC catalog with sample collection items
1212
stac-populator:
1313
container_name: stac-populator
14-
image: ghcr.io/crim-ca/stac-populator:master
14+
image: ${STAC_POPULATOR_IMAGE}
1515
environment:
1616
- STAC_ASSET_GENERATOR_TIMEOUT=${STAC_ASSET_GENERATOR_TIMEOUT}
1717
- STAC_HOST=http://stac:8000/stac # STAC API internally accessed to avoid Twitcher authentication

Diff for: ‎docs/source/conf.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@
6969
# built documents.
7070
#
7171
# The short X.Y version.
72-
version = '2.6.1'
72+
version = '2.6.2'
7373
# The full version, including alpha/beta/rc tags.
74-
release = '2.6.1'
74+
release = '2.6.2'
7575

7676
# The language for content autogenerated by Sphinx. Refer to documentation
7777
# for a list of supported languages.

0 commit comments

Comments
 (0)