Skip to content

Commit 62b32de

Browse files
tlvutlvu
authored
Update autodeploy image to latest version (#595)
## Overview This makes autodeploy compatible with newer Docker engine installed on the host (fixes #246). Also makes autodeploy compatible with newer docker-compose syntax version (fixes #505). New docker image built from https://github.com/Ouranosinc/docker-compose. ## Changes **Non-breaking changes** - Update autodeploy image to latest version **Breaking changes** - None ## 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 3d5352d + ee0f755 commit 62b32de

File tree

13 files changed

+50
-30
lines changed

13 files changed

+50
-30
lines changed

‎.bumpversion.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tool.bumpversion]
2-
current_version = "2.18.4"
2+
current_version = "2.18.5"
33
commit = true
44
tag = false
55
tag_name = "{new_version}"

‎CHANGES.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,28 @@
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.18.5](https://github.com/bird-house/birdhouse-deploy/tree/2.18.5) (2025-10-15)
21+
------------------------------------------------------------------------------------------------------------------
22+
1823
## Fixes
1924

2025
- Modify Prometheus Thredds counter to record bytes instead of kb.
2126
- Change longterm rule names to follow naming conventions.
2227

28+
29+
## Changes
30+
31+
- Update autodeploy image to latest version
32+
33+
This makes autodeploy compatible with newer Docker engine installed on the
34+
host [#246](https://github.com/bird-house/birdhouse-deploy/issues/246).
35+
36+
Also makes autodeploy compatible with newer docker-compose syntax version
37+
[#505](https://github.com/bird-house/birdhouse-deploy/issues/505).
38+
39+
2340
[2.18.4](https://github.com/bird-house/birdhouse-deploy/tree/2.18.4) (2025-10-01)
2441
------------------------------------------------------------------------------------------------------------------
2542

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ override BIRDHOUSE_MAKE_DIR := $(shell realpath -P $$(dirname $(BIRDHOUSE_MAKE_C
88
# Generic variables
99
override SHELL := bash
1010
override APP_NAME := birdhouse-deploy
11-
override APP_VERSION := 2.18.4
11+
override APP_VERSION := 2.18.5
1212

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

‎README.rst‎

Lines changed: 4 additions & 4 deletions
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.18.4.svg
21+
.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.18.5.svg
2222
:alt: Commits since latest release
23-
:target: https://github.com/bird-house/birdhouse-deploy/compare/2.18.4...master
23+
:target: https://github.com/bird-house/birdhouse-deploy/compare/2.18.5...master
2424

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

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

‎RELEASE.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.18.4 2025-10-01T00:13:51Z
1+
2.18.5 2025-10-15T18:55:32Z

‎birdhouse/components/canarie-api/docker_configuration.py.template‎

Lines changed: 4 additions & 4 deletions
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.18.4',
112-
'releaseTime': '2025-10-01T00:13:51Z',
111+
'version': '2.18.5',
112+
'releaseTime': '2025-10-15T18:55: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.18.4',
145-
'releaseTime': '2025-10-01T00:13:51Z',
144+
'version': '2.18.5',
145+
'releaseTime': '2025-10-15T18:55:32Z',
146146
'institution': '${BIRDHOUSE_INSTITUTION}',
147147
'researchSubject': '${BIRDHOUSE_SUBJECT}',
148148
'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}',

‎birdhouse/components/scheduler/default.env‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@ export SCHEDULER_DOCKER=pavics/crontab
88
export SCHEDULER_VERSION=0.6-rc2
99
export SCHEDULER_IMAGE='${SCHEDULER_DOCKER}:${SCHEDULER_VERSION}'
1010

11-
# The old version of docker-compose is required so that the same command can be run inside the
12-
# autodeploy image as the command that is run on the host machine.
13-
# TODO: update the autodeploy image so that this is not necessary.
14-
export DOCKER_COMPOSE=docker-compose
15-
1611
export DELAYED_EVAL="
1712
$DELAYED_EVAL
1813
SCHEDULER_IMAGE

‎birdhouse/deployment/triggerdeploy.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,12 @@ triggerdeploy START_TIME=${START_TIME}"
179179
# Read BIRDHOUSE_AUTODEPLOY_EXTRA_REPOS
180180
read_basic_configs_only
181181

182+
if [ -n "$AUTODEPLOY_GIT_GLOBAL_SAFE_DIRECTORY" ]; then
183+
# Since git v2.35.2, because autodeploy runs as root but the repos are not
184+
# checkout by root.
185+
git config --global --add safe.directory '*'
186+
fi
187+
182188
set -x
183189

184190
SHOULD_TRIGGER=""

‎birdhouse/optional-components/scheduler-job-autodeploy/config.yml.template‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@
88
--volume ${BIRDHOUSE_LOG_DIR}:${BIRDHOUSE_LOG_DIR}:rw
99
--volume ${COMPOSE_DIR}/..:${COMPOSE_DIR}/..:rw
1010
--volume ${BIRDHOUSE_AUTODEPLOY_DEPLOY_KEY_ROOT_DIR}:${BIRDHOUSE_AUTODEPLOY_DEPLOY_KEY_ROOT_DIR}:ro
11-
--volume ${BIRDHOUSE_LOCAL_ENV}:${BIRDHOUSE_LOCAL_ENV}
11+
--volume ${BIRDHOUSE_LOCAL_ENV}:${BIRDHOUSE_LOCAL_ENV}:rw
12+
--volume ${BIRDHOUSE_SSL_CERTIFICATE}:${BIRDHOUSE_SSL_CERTIFICATE}:ro
1213
--env COMPOSE_DIR=${COMPOSE_DIR}
1314
--env BIRDHOUSE_AUTODEPLOY_DEPLOY_KEY_ROOT_DIR=${BIRDHOUSE_AUTODEPLOY_DEPLOY_KEY_ROOT_DIR}
1415
--env CODE_OWNERSHIP=${BIRDHOUSE_AUTODEPLOY_CODE_OWNERSHIP}
1516
--env BIRDHOUSE_LOCAL_ENV=${BIRDHOUSE_LOCAL_ENV}
1617
--env BIRDHOUSE_COMPOSE=${BIRDHOUSE_COMPOSE}
1718
--env BIRDHOUSE_LOG_DIR=${BIRDHOUSE_LOG_DIR}
1819
--env AUTODEPLOY_SILENT=true
20+
--env AUTODEPLOY_GIT_GLOBAL_SAFE_DIRECTORY=1
1921
${BIRDHOUSE_AUTODEPLOY_JUPYTERHUB_ARGS}${AUTODEPLOY_PLATFORM_EXTRA_DOCKER_ARGS}
2022
image: '${SCHEDULER_JOB_AUTODEPLOY_IMAGE}'

‎birdhouse/optional-components/scheduler-job-autodeploy/default.env‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ if echo "${BIRDHOUSE_EXTRA_CONF_DIRS}" | grep -q 'jupyterhub[[:space:]]*$'; then
33
--env JUPYTERHUB_USER_DATA_DIR=${JUPYTERHUB_USER_DATA_DIR}'
44
fi
55

6-
export SCHEDULER_JOB_AUTODEPLOY_DOCKER='pavics/docker-compose-git'
7-
export SCHEDULER_JOB_AUTODEPLOY_VERSION='docker-18.09.7-compose-1.25.1'
6+
export SCHEDULER_JOB_AUTODEPLOY_DOCKER='pavics/docker-compose'
7+
export SCHEDULER_JOB_AUTODEPLOY_VERSION='docker-28.5.1-compose-v2.40.0-251014'
88
export SCHEDULER_JOB_AUTODEPLOY_IMAGE='${SCHEDULER_JOB_AUTODEPLOY_DOCKER}:${SCHEDULER_JOB_AUTODEPLOY_VERSION}'
99

1010
export BIRDHOUSE_AUTODEPLOY_EXTRA_REPOS_AS_DOCKER_VOLUMES='$(for d in ${BIRDHOUSE_AUTODEPLOY_EXTRA_REPOS}; do printf " --volume %s:%s:rw " "$d" "$d"; done)'

0 commit comments

Comments
 (0)