Skip to content

Commit 163e395

Browse files
committed
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 relay 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 <afrosi@redhat.com>
1 parent f9600c8 commit 163e395

4 files changed

Lines changed: 6 additions & 9 deletions

File tree

Containerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build environment for bink CLI with all C dependencies
2-
ARG FEDORA_VERSION=43
2+
ARG FEDORA_VERSION=44
33
FROM quay.io/fedora/fedora:${FEDORA_VERSION} AS builder
44

55
# Install Go and required C libraries for Podman bindings

Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ extract = $(shell grep '$(1)' $(DEFAULTS_GO) | head -1 | sed 's/.*"\(.*\)"/\1/')
77
BINK_IMAGE := $(call extract,binkImageBase ):latest
88
CLUSTER_IMAGE := $(call extract,clusterImageBase ):latest
99
DNS_IMAGE := $(call extract,dnsImageBase ):latest
10-
FEDORA_VERSION := $(call extract,FedoraVersion )
1110

1211
# Binary
1312
BINK_BINARY := bink
@@ -40,13 +39,13 @@ build-bink:
4039
# Build the bink CLI container image
4140
build-bink-image:
4241
@echo "=== Building bink CLI container image ==="
43-
podman build --build-arg FEDORA_VERSION=$(FEDORA_VERSION) --build-arg VERSION=$(VERSION) -t $(BINK_IMAGE) -f Containerfile .
42+
podman build --build-arg VERSION=$(VERSION) -t $(BINK_IMAGE) -f Containerfile .
4443
@echo "✅ Bink CLI image built: $(BINK_IMAGE)"
4544

4645
# Build the cluster container image
4746
build-cluster-image:
4847
@echo "=== Building cluster container image ==="
49-
podman build --build-arg FEDORA_VERSION=$(FEDORA_VERSION) -t $(CLUSTER_IMAGE) -f $(VM_DIR)/Containerfile $(VM_DIR)
48+
podman build -t $(CLUSTER_IMAGE) -f $(VM_DIR)/Containerfile $(VM_DIR)
5049
@echo "✅ Cluster image built: $(CLUSTER_IMAGE)"
5150

5251
# Build the DNS container image

containerfiles/cluster-image/Containerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG FEDORA_VERSION=43
1+
ARG FEDORA_VERSION=44
22
FROM quay.io/fedora/fedora:${FEDORA_VERSION}
33

44
RUN dnf install -y --setopt=install_weak_deps=0 \

internal/config/defaults.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,19 @@ const (
1313
DefaultNetworkName = "podman"
1414
DefaultSubnet = "10.88.0.0/16"
1515

16-
FedoraVersion = "43"
17-
1816
binkImageBase = "ghcr.io/bootc-dev/bink/bink"
1917
clusterImageBase = "ghcr.io/bootc-dev/bink/cluster"
2018
dnsImageBase = "ghcr.io/bootc-dev/bink/dns"
2119

2220
DefaultNodeImage = "ghcr.io/bootc-dev/bink/node:v1.35-fedora-44-disk"
2321

24-
DefaultBaseDisk = "/images/disk.qcow2"
22+
DefaultBaseDisk = "/images/disk.qcow2"
2523
DefaultControlPlaneMemory = 1900
2624
DefaultControlPlaneMaxMemory = 4096
2725
DefaultWorkerMemory = 768
2826
DefaultWorkerMaxMemory = 2048
2927
DefaultVCPUs = 2
30-
DefaultDiskSize = "10G"
28+
DefaultDiskSize = "10G"
3129

3230
DefaultSSHPort = 2222
3331
DefaultSSHUser = "core"

0 commit comments

Comments
 (0)