Skip to content

Commit 6254e00

Browse files
Fix Build and push complement image CI job pointing to non-existent image (#19523)
https://github.com/element-hq/synapse/actions/runs/22609655282/job/65509315002#step:8:39 ``` Error response from daemon: No such image: complement-synapse:latest ``` Regressed in #19475 (comment) where we updated `complement.sh` to build `localhost/complement-synapse` instead of `complement-synapse`.
1 parent 3aa948c commit 6254e00

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

.github/workflows/push_complement_image.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ jobs:
6969
run: |
7070
for TAG in ${{ join(fromJson(steps.meta.outputs.json).tags, ' ') }}; do
7171
echo "tag and push $TAG"
72+
# `localhost/complement-synapse` should match the image created by `scripts-dev/complement.sh`
7273
docker tag complement-synapse $TAG
7374
docker push $TAG
7475
done

changelog.d/19523.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix `Build and push complement image` CI job pointing to non-existent image.

scripts-dev/complement.sh

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,22 @@ set -e
3838
# Tag local builds with a dummy registry namespace so that later builds may reference
3939
# them exactly instead of accidentally pulling from a remote registry.
4040
#
41-
# This is important as some storage drivers/types prefer remote images over local
42-
# (`containerd`) which causes problems as we're testing against some remote image that
43-
# doesn't include all of the changes that we're trying to test (be it locally or in a PR
44-
# in CI). This is spawning from a real-world problem where the GitHub runners were
41+
# This is important as some Docker storage drivers/types prefer remote images over local
42+
# (like `containerd`) which causes problems as we're testing against some remote image
43+
# that doesn't include all of the changes that we're trying to test (be it locally or in
44+
# a PR in CI). This is spawning from a real-world problem where the GitHub runners were
4545
# updated to use Docker Engine 29.0.0+ which uses `containerd` by default for new
4646
# installations.
47+
#
48+
# XXX: If the Docker image name changes, don't forget to update
49+
# `.github/workflows/push_complement_image.yml` as well
4750
LOCAL_IMAGE_NAMESPACE=localhost
4851

4952
# The image tags for how these images will be stored in the registry
5053
SYNAPSE_IMAGE_PATH="$LOCAL_IMAGE_NAMESPACE/synapse"
5154
SYNAPSE_WORKERS_IMAGE_PATH="$LOCAL_IMAGE_NAMESPACE/synapse-workers"
55+
# XXX: If the Docker image name changes, don't forget to update
56+
# `.github/workflows/push_complement_image.yml` as well
5257
COMPLEMENT_SYNAPSE_IMAGE_PATH="$LOCAL_IMAGE_NAMESPACE/complement-synapse"
5358

5459
SYNAPSE_EDITABLE_IMAGE_PATH="$LOCAL_IMAGE_NAMESPACE/synapse-editable"

0 commit comments

Comments
 (0)