Skip to content

Commit 05f7efa

Browse files
myasnikovdaniilclaude
myasnikovdaniil
and
claude
committed
fix(ci): emit a single tag for capi-providers under OCI export (#3257)
capi-providers-cpprovider passes two --tag flags; under --output type=oci buildx writes both refs into the archive index, and `skopeo copy oci-archive:<f> docker://…` in the privileged push loop then fails with "more than one image in oci, choose an image". Gate the secondary :$(IMAGE_TAG)-$(TAG) tag off when OCI_EXPORT_DIR is set so the exported archive holds a single manifest. Refs: #3257 Assisted-By: Claude <[email protected]> Co-Authored-By: Claude Opus 4.8 <[email protected]> Signed-off-by: Myasnikov Daniil <[email protected]>
1 parent 94205dd commit 05f7efa

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

  • packages/system/capi-providers-cpprovider

‎packages/system/capi-providers-cpprovider/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ IMAGE_TAG = $(UPSTREAM_VERSION)-cozystack.$(COZYSTACK_REV)
1919
image:
2020
docker buildx build images/cluster-api-control-plane-provider-kamaji \
2121
--tag $(IMAGE_BASE):$(IMAGE_TAG) \
22-
--tag $(IMAGE_BASE):$(IMAGE_TAG)-$(TAG) \
22+
$(if $(strip $(OCI_EXPORT_DIR)),,--tag $(IMAGE_BASE):$(IMAGE_TAG)-$(TAG)) \
2323
--cache-from type=registry,ref=$(IMAGE_BASE):latest \
2424
$(if $(strip $(OCI_EXPORT_DIR)),,--cache-to type=inline) \
2525
$(call oci-output,cluster-api-control-plane-provider-kamaji) \

0 commit comments

Comments
 (0)