Skip to content

Commit 5db06e4

Browse files
authored
Merge pull request #723 from Michcioperz/push-wlotwswyluxu
Bump base images
2 parents ac6de63 + 08bb037 commit 5db06e4

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

images/dnsmasq/Makefile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,19 @@ CONTAINER_PREFIX ?= k8s-dns
2121
ALL_ARCH := amd64 arm arm64 ppc64le s390x
2222
MANIFEST_IMAGE := $(REGISTRY)/$(CONTAINER_PREFIX)-dnsmasq
2323
IMAGE := $(CONTAINER_PREFIX)-dnsmasq-$(ARCH)
24-
COMPILE_IMAGE := registry.k8s.io/kube-cross:v1.7.6-k8s1.6-0
24+
# Find the correct tag at https://github.com/kubernetes/release/blob/master/images/build/cross/variants.yaml
25+
COMPILE_IMAGE := registry.k8s.io/build-image/kube-cross:v1.34.0-go1.24.9-bullseye.0
2526
OUTPUT_DIR := _output/$(ARCH)
2627

2728
# Ensure that the docker command line supports the manifest images
2829
export DOCKER_CLI_EXPERIMENTAL=enabled
2930

3031
# Multiarch image
31-
# Uploaded: May 19, 2025
32-
BASEIMAGE ?= gcr.io/distroless/base-debian12@sha256:cef75d12148305c54ef5769e6511a5ac3c820f39bf5c8a4fbfd5b76b4b8da843
32+
# Find the latest hash by opening in browser https://gcr.io/distroless/base-debian12:latest
33+
BASEIMAGE ?= gcr.io/distroless/base-debian12@sha256:9e9b50d2048db3741f86a48d939b4e4cc775f5889b3496439343301ff54cdba8
3334
ifeq ($(ARCH),amd64)
34-
COMPILE_IMAGE := registry.k8s.io/build-image/debian-base-$(ARCH):bookworm-v1.0.4
35+
# Find the correct tag at https://github.com/kubernetes/release/blob/master/images/build/debian-base/variants.yaml
36+
COMPILE_IMAGE := registry.k8s.io/build-image/debian-base-$(ARCH):bookworm-v1.0.6
3537
else ifeq ($(ARCH),arm)
3638
TRIPLE ?= arm-linux-gnueabihf
3739
QEMUARCH := arm

rules.mk

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,10 @@ SRC_DIRS := cmd pkg
3030

3131
ALL_ARCH := amd64 arm arm64 ppc64le s390x
3232
# Multiarch image
33-
# Debian distroless image uploaded on 2025-03-28
34-
BASEIMAGE ?= gcr.io/distroless/static-debian12@sha256:765ef30aff979959710073e7ba3b163d479a285d7d96d0020fca8c1501de48cb
35-
IPTIMAGE ?= registry.k8s.io/build-image/distroless-iptables:v0.6.12@sha256:a9bb141f06c2ad392cf308f826fba5f7dfd8b78a8e33eb275a6857e13bc130c6
33+
# Find the latest hash by opening in browser https://gcr.io/distroless/static-debian12:latest
34+
BASEIMAGE ?= gcr.io/distroless/static-debian12@sha256:87bce11be0af225e4ca761c40babb06d6d559f5767fbf7dc3c47f0f1a466b92c
35+
# Find the correct tag at https://github.com/kubernetes/release/blob/master/images/build/distroless-iptables/variants.yaml
36+
IPTIMAGE ?= registry.k8s.io/build-image/distroless-iptables:v0.7.10@sha256:1a19fbdbdb566bf26dd1e4f2f26c21db1a63991d5cb5d17f3ba158c8465810c1
3637

3738
# These rules MUST be expanded at reference time (hence '=') as BINARY
3839
# is dynamically scoped.

0 commit comments

Comments
 (0)