Skip to content

Commit 11e7611

Browse files
committed
fix: rework image digests one more time
For some reason buildx in the CI doesn't want to export full metadata, only the digest is exposed. Use a mixed solution by building the image tag via bldr as previously, while attaching the digest from buildx. Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com> (cherry picked from commit 20f2cac)
1 parent 69cc222 commit 11e7611

File tree

2 files changed

+24
-5
lines changed

2 files changed

+24
-5
lines changed

.kres.yaml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,8 @@ spec:
118118
toplevel: true
119119
- name: check-dirty
120120
toplevel: true
121+
- name: extensions-metadata
122+
toplevel: true
121123
- name: internal/extensions/image-digests
122124
toplevel: true
123125
- name: internal/extensions/descriptions.yaml
@@ -176,6 +178,18 @@ spec:
176178
condition: on-pull-request
177179
---
178180
kind: custom.Step
181+
name: extensions-metadata
182+
spec:
183+
makefile:
184+
enabled: true
185+
phony: true
186+
depends:
187+
- internal/extensions/image-digests
188+
script:
189+
- |
190+
@cp internal/extensions/image-digests $(ARTIFACTS)/extensions-metadata
191+
---
192+
kind: custom.Step
179193
name: internal/extensions/image-digests
180194
spec:
181195
makefile:
@@ -186,8 +200,8 @@ spec:
186200
script:
187201
- |
188202
@rm -f internal/extensions/image-digests
189-
@$(foreach target,$(TARGETS),echo $(shell yq -r '."image.name" + "@" + ."containerimage.digest"' $(ARTIFACTS)/$(target).metadata.json) >> internal/extensions/image-digests;)
190-
@$(foreach target,$(NONFREE_TARGETS),echo $(shell yq -r '."image.name" + "@" + ."containerimage.digest"' $(ARTIFACTS)/$(target).metadata.json) >> internal/extensions/image-digests;)
203+
@$(foreach target,$(TARGETS),echo $(REGISTRY)/$(USERNAME)/$(target):$(shell $(ARTIFACTS)/bldr eval --target $(target) --build-arg TAG=$(TAG) '{{.VERSION}}' 2>/dev/null)@$(shell yq -r '."containerimage.digest"' $(ARTIFACTS)/$(target).metadata.json) >> internal/extensions/image-digests;)
204+
@$(foreach target,$(NONFREE_TARGETS),echo $(REGISTRY)/$(USERNAME)/$(target):$(shell $(ARTIFACTS)/bldr eval --target $(target) --build-arg TAG=$(TAG) '{{.VERSION}}' 2>/dev/null)@$(shell yq -r '."containerimage.digest"' $(ARTIFACTS)/$(target).metadata.json) >> internal/extensions/image-digests;)
191205
---
192206
kind: custom.Step
193207
name: internal/extensions/descriptions.yaml

Makefile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2026-03-17T13:52:47Z by kres 7bfd168-dirty.
3+
# Generated on 2026-03-17T18:42:59Z by kres 3675077.
44

55
# common variables
66

@@ -255,11 +255,15 @@ extensions-catalog: $(ARTIFACTS)/bldr
255255
check-dirty:
256256
@if test -n "`git status --porcelain`"; then echo "Source tree is dirty"; git status; git diff; exit 1 ; fi
257257

258+
.PHONY: extensions-metadata
259+
extensions-metadata: internal/extensions/image-digests
260+
@cp internal/extensions/image-digests $(ARTIFACTS)/extensions-metadata
261+
258262
.PHONY: internal/extensions/image-digests
259263
internal/extensions/image-digests: $(ARTIFACTS)/bldr
260264
@rm -f internal/extensions/image-digests
261-
@$(foreach target,$(TARGETS),echo $(shell yq -r '."image.name" + "@" + ."containerimage.digest"' $(ARTIFACTS)/$(target).metadata.json) >> internal/extensions/image-digests;)
262-
@$(foreach target,$(NONFREE_TARGETS),echo $(shell yq -r '."image.name" + "@" + ."containerimage.digest"' $(ARTIFACTS)/$(target).metadata.json) >> internal/extensions/image-digests;)
265+
@$(foreach target,$(TARGETS),echo $(REGISTRY)/$(USERNAME)/$(target):$(shell $(ARTIFACTS)/bldr eval --target $(target) --build-arg TAG=$(TAG) '{{.VERSION}}' 2>/dev/null)@$(shell yq -r '."containerimage.digest"' $(ARTIFACTS)/$(target).metadata.json) >> internal/extensions/image-digests;)
266+
@$(foreach target,$(NONFREE_TARGETS),echo $(REGISTRY)/$(USERNAME)/$(target):$(shell $(ARTIFACTS)/bldr eval --target $(target) --build-arg TAG=$(TAG) '{{.VERSION}}' 2>/dev/null)@$(shell yq -r '."containerimage.digest"' $(ARTIFACTS)/$(target).metadata.json) >> internal/extensions/image-digests;)
263267

264268
.PHONY: internal/extensions/descriptions.yaml
265269
internal/extensions/descriptions.yaml: internal/extensions/image-digests
@@ -300,3 +304,4 @@ release-notes: $(ARTIFACTS)
300304
conformance:
301305
@docker pull $(CONFORMANCE_IMAGE)
302306
@docker run --rm -it -v $(PWD):/src -w /src $(CONFORMANCE_IMAGE) enforce
307+

0 commit comments

Comments
 (0)