From 2f76b0b62aa59bd92293d7a9f22dbdba32fa941c Mon Sep 17 00:00:00 2001 From: Alice Frosi Date: Tue, 7 Jul 2026 14:38:11 +0200 Subject: [PATCH 1/3] make: drop the intermediate builder stage Clean-up the builder-bink intermediate stage since it isn't used. The release.yaml already build the stage directly to extract the bink binary, so this is a left over. Signed-off-by: Alice Frosi --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 5610851..93b5176 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,6 @@ build-bink: # Build the bink CLI container image build-bink-image: @echo "=== Building bink CLI container image ===" - podman build --build-arg FEDORA_VERSION=$(FEDORA_VERSION) --build-arg VERSION=$(VERSION) --target builder -t localhost/bink-builder:latest -f Containerfile . podman build --build-arg FEDORA_VERSION=$(FEDORA_VERSION) --build-arg VERSION=$(VERSION) -t $(BINK_IMAGE) -f Containerfile . @echo "✅ Bink CLI image built: $(BINK_IMAGE)" From 109426f7a9201a094f84538a4eca2620a483e496 Mon Sep 17 00:00:00 2001 From: Alice Frosi Date: Tue, 7 Jul 2026 15:02:16 +0200 Subject: [PATCH 2/3] Remove constant for the fedora version Initially, we decided to put all the constants in defaults, but the versioning for the container images is quite complex and scattered in the code. Let's rely on the default argument on top of the Containerfile. Additionally, in this way, renovate can update the automatically the containerfiles. Bump also the version from 43 to 44. Signed-off-by: Alice Frosi --- Containerfile | 2 +- Makefile | 5 ++--- containerfiles/cluster-image/Containerfile | 2 +- internal/config/defaults.go | 6 ++---- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Containerfile b/Containerfile index 21e953f..1e2873c 100644 --- a/Containerfile +++ b/Containerfile @@ -1,5 +1,5 @@ # Build environment for bink CLI with all C dependencies -ARG FEDORA_VERSION=43 +ARG FEDORA_VERSION=44 FROM quay.io/fedora/fedora:${FEDORA_VERSION} AS builder # Install Go and required C libraries for Podman bindings diff --git a/Makefile b/Makefile index 93b5176..19b5638 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,6 @@ extract = $(shell grep '$(1)' $(DEFAULTS_GO) | head -1 | sed 's/.*"\(.*\)"/\1/') BINK_IMAGE := $(call extract,binkImageBase ):latest CLUSTER_IMAGE := $(call extract,clusterImageBase ):latest DNS_IMAGE := $(call extract,dnsImageBase ):latest -FEDORA_VERSION := $(call extract,FedoraVersion ) # Binary BINK_BINARY := bink @@ -40,13 +39,13 @@ build-bink: # Build the bink CLI container image build-bink-image: @echo "=== Building bink CLI container image ===" - podman build --build-arg FEDORA_VERSION=$(FEDORA_VERSION) --build-arg VERSION=$(VERSION) -t $(BINK_IMAGE) -f Containerfile . + podman build --build-arg VERSION=$(VERSION) -t $(BINK_IMAGE) -f Containerfile . @echo "✅ Bink CLI image built: $(BINK_IMAGE)" # Build the cluster container image build-cluster-image: @echo "=== Building cluster container image ===" - podman build --build-arg FEDORA_VERSION=$(FEDORA_VERSION) -t $(CLUSTER_IMAGE) -f $(VM_DIR)/Containerfile $(VM_DIR) + podman build -t $(CLUSTER_IMAGE) -f $(VM_DIR)/Containerfile $(VM_DIR) @echo "✅ Cluster image built: $(CLUSTER_IMAGE)" # Build the DNS container image diff --git a/containerfiles/cluster-image/Containerfile b/containerfiles/cluster-image/Containerfile index 83af529..8ef078b 100644 --- a/containerfiles/cluster-image/Containerfile +++ b/containerfiles/cluster-image/Containerfile @@ -1,4 +1,4 @@ -ARG FEDORA_VERSION=43 +ARG FEDORA_VERSION=44 FROM quay.io/fedora/fedora:${FEDORA_VERSION} RUN dnf install -y --setopt=install_weak_deps=0 \ diff --git a/internal/config/defaults.go b/internal/config/defaults.go index 0d2e15f..829e504 100644 --- a/internal/config/defaults.go +++ b/internal/config/defaults.go @@ -13,21 +13,19 @@ const ( DefaultNetworkName = "podman" DefaultSubnet = "10.88.0.0/16" - FedoraVersion = "43" - binkImageBase = "ghcr.io/bootc-dev/bink/bink" clusterImageBase = "ghcr.io/bootc-dev/bink/cluster" dnsImageBase = "ghcr.io/bootc-dev/bink/dns" DefaultNodeImage = "ghcr.io/bootc-dev/bink/node:v1.35-fedora-44-disk" - DefaultBaseDisk = "/images/disk.qcow2" + DefaultBaseDisk = "/images/disk.qcow2" DefaultControlPlaneMemory = 1900 DefaultControlPlaneMaxMemory = 4096 DefaultWorkerMemory = 768 DefaultWorkerMaxMemory = 2048 DefaultVCPUs = 2 - DefaultDiskSize = "10G" + DefaultDiskSize = "10G" DefaultSSHPort = 2222 DefaultSSHUser = "core" From c0f8be7a3d063a8e06e78d77c5ed0e7a7fb8d6da Mon Sep 17 00:00:00 2001 From: Alice Frosi Date: Tue, 7 Jul 2026 15:09:08 +0200 Subject: [PATCH 3/3] containerfiles: version the base image for dns The fedora-minimal as based image for the dns one was always referring latest. Set the version to fedora 44 as the rest of the images. Signed-off-by: Alice Frosi --- containerfiles/dns/Containerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/containerfiles/dns/Containerfile b/containerfiles/dns/Containerfile index abc8b8f..b5761e0 100644 --- a/containerfiles/dns/Containerfile +++ b/containerfiles/dns/Containerfile @@ -1,4 +1,5 @@ -FROM registry.fedoraproject.org/fedora-minimal +ARG FEDORA_VERSION=44 +FROM registry.fedoraproject.org/fedora-minimal:${FEDORA_VERSION} RUN microdnf install -y dnsmasq && microdnf clean all