Skip to content

A minor cleanup and consolidation of the fedora version #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HarshwardhanPatil07 merged 4 commits into from
Jul 13, 2026
Merged

A minor cleanup and consolidation of the fedora version #94

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f76b0b
make: drop the intermediate builder stage
alicefr Jul 7, 2026
109426f
Remove constant for the fedora version
alicefr Jul 7, 2026
c0f8be7
containerfiles: version the base image for dns
alicefr Jul 7, 2026
35d378f
gha: update the fedora image for the GHA
alicefr Jul 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 2 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -40,14 +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) --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 .
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
Expand Down
2 changes: 1 addition & 1 deletion containerfiles/cluster-image/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion containerfiles/dns/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 2 additions & 4 deletions internal/config/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down