From d91c8b28979380fefeade8a6e3893de4a5853c82 Mon Sep 17 00:00:00 2001 From: Alice Frosi Date: Tue, 20 Oct 2026 11:16:17 +0200 Subject: [PATCH] node-images: move the bcvk main Originally, there was a bug in bink where the remote digest and the digest reported by bootc-status didn't match. The initial suspicion was a bug in bcvk, therefore we move temporary to a branch with a fix. The real issue has been fixed by https://github.com/bootc-dev/bink/pull/141. Signed-off-by: Alice Frosi --- node-images/fedora/Containerfile.disk | 5 +---- node-images/fedora/Makefile | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/node-images/fedora/Containerfile.disk b/node-images/fedora/Containerfile.disk index 64d1688..a729ac2 100644 --- a/node-images/fedora/Containerfile.disk +++ b/node-images/fedora/Containerfile.disk @@ -4,10 +4,7 @@ ARG BCVK_REF=main FROM quay.io/fedora/fedora-minimal:${FEDORA_VERSION} AS bcvk-builder ARG BCVK_REF RUN dnf install -y --setopt=install_weak_deps=0 git rust cargo openssl-devel pkg-config && dnf clean all -# TODO: currently, there is a bug in bcvk where the digest for the image -# doesn't match with the remote digest. A temporary fix is available at this -# repository. See: https://github.com/bootc-dev/bcvk/pull/314 -RUN git clone https://github.com/Johan-Liebert1/bcvk.git /bcvk && \ +RUN git clone https://github.com/bootc-dev/bcvk.git /bcvk && \ git -C /bcvk checkout ${BCVK_REF} && \ cargo build --release --manifest-path /bcvk/Cargo.toml diff --git a/node-images/fedora/Makefile b/node-images/fedora/Makefile index 03d3c41..319f156 100644 --- a/node-images/fedora/Makefile +++ b/node-images/fedora/Makefile @@ -6,10 +6,7 @@ DISK_SIZE ?= 10G BUILD_MEMORY ?= 4G BUILD_LOG_DIR ?= /tmp/bcvk-logs BCVK_EXTRA_ARGS ?= -# TODO: currently, there is a bug in bcvk where the digest for the image -# doesn't match with the remote digest. A temporary fix is available at this -# branch -BCVK_REF ?= img-to-install-cli-opt +BCVK_REF ?= main IMAGE_TAG ?= v$(KUBE_MINOR)-fedora-$(FEDORA_VERSION) REGISTRY ?= ghcr.io/bootc-dev/bink