Merge pull request #22032 from minikube-bot/auto_bump_docker_version-6d351f1

medyagh · web-flow · commit e4a6c3202730 · 2025-12-05T16:25:08.000-08:00
Kicbase/ISO: Update docker from 28.5.1 to 28.5.2
diff --git a/Makefile b/Makefile
@@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \"
 HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2)
 
 # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
-ISO_VERSION ?= v1.37.0-1763503576-21924
+ISO_VERSION ?= v1.37.0-1764843329-22032
 
 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
 DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash
@@ -38,3 +38,4 @@ sha256 61c65bddb74ea73ba9644769ae673b9cb05b8ae66902393d6123d05a5b07ee01  docker-
 sha256 db69fed523677c5a24bbc6ef2e85db07205a6af2fe8838c4db652bfff8227cfa  docker-28.3.3.tgz
 sha256 059416f4fe7465bdedbabd6d34db524e6e3bef65f3b61caa42a3d8ca94150ed2  docker-28.4.0.tgz
 sha256 de54e37157f45a43f42f6271302372d95c0eb992cc35ecaee74989bb14058c94  docker-28.5.1.tgz
+sha256 9e4f82996ab790724094475ebed33a736434bfe5d45231b676fef22ffb80044d  docker-28.5.2.tgz
diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOCKER_BIN_AARCH64_VERSION = 28.5.1
+DOCKER_BIN_AARCH64_VERSION = 28.5.2
 DOCKER_BIN_AARCH64_SITE = https://download.docker.com/linux/static/stable/aarch64
 DOCKER_BIN_AARCH64_SOURCE = docker-$(DOCKER_BIN_AARCH64_VERSION).tgz
 
diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash
@@ -74,3 +74,4 @@ sha256 9d274a3f330764ebd9cc82fe29e5dd5d0569bc34f9f53e3ac8905444cd88b413  docker-
 sha256 40c16bcf324f354b382d07e845e6a79e3493fc0c09b252dff9e1a46125589bff  docker-28.3.3.tgz
 sha256 21516934188f06d0e5f232cbde8112701f6d82899016240bc7a5d619f6b0059c  docker-28.4.0.tgz
 sha256 5c0d19f31fece1accd0358bb8cff591fe25d7b6cba19f0fd412cbfdc07f75ff6  docker-28.5.1.tgz
+sha256 ea90cfd12e1eeb12aa1c971741adb8bd4ed88e2a574eaac13f5029a1dbc6300d  docker-28.5.2.tgz
diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOCKER_BIN_VERSION = 28.5.1
+DOCKER_BIN_VERSION = 28.5.2
 DOCKER_BIN_SITE = https://download.docker.com/linux/static/stable/x86_64
 DOCKER_BIN_SOURCE = docker-$(DOCKER_BIN_VERSION).tgz
 
diff --git a/hack/kicbase_version/os-package-list.txt b/hack/kicbase_version/os-package-list.txt
@@ -19,7 +19,7 @@ ii  conntrack                       1:1.4.7-1+b2                   amd64
 ii  containerd.io                   2.2.0-2~debian.12~bookworm     amd64        An open and reliable container runtime
 ii  containernetworking-plugins     1.1.1+ds1-3+b5                 amd64        standard networking plugins - binaries
 ii  coreutils                       9.1-1                          amd64        GNU core utilities
-ii  cri-o                           1.34.2-1.1                     amd64        Open Container Initiative-based implementation of Kubernetes Container Runtime Interface
+ii  cri-o                           1.34.3-1.1                     amd64        Open Container Initiative-based implementation of Kubernetes Container Runtime Interface
 ii  crun                            1.8.1-1+deb12u1                amd64        lightweight OCI runtime for running containers
 ii  curl                            7.88.1-10+deb12u14             amd64        command line tool for transferring data with URL syntax
 ii  dash                            0.5.12-2                       amd64        POSIX-compliant shell
@@ -35,9 +35,9 @@ ii  diffutils                       1:3.8-4                        amd64
 ii  dirmngr                         2.2.40-1.1+deb12u1             amd64        GNU privacy guard - network certificate management service
 ii  dmsetup                         2:1.02.185-2                   amd64        Linux Kernel Device Mapper userspace library
 ii  dnsutils                        1:9.18.41-1~deb12u1            all          Transitional package for bind9-dnsutils
-ii  docker-buildx-plugin            0.30.0-1~debian.12~bookworm    amd64        Docker Buildx plugin extends build capabilities with BuildKit.
-ii  docker-ce                       5:29.0.4-1~debian.12~bookworm  amd64        Docker: the open-source application container engine
-ii  docker-ce-cli                   5:29.0.4-1~debian.12~bookworm  amd64        Docker CLI: the open-source application container engine
+ii  docker-buildx-plugin            0.30.1-1~debian.12~bookworm    amd64        Docker Buildx plugin extends build capabilities with BuildKit.
+ii  docker-ce                       5:29.1.2-1~debian.12~bookworm  amd64        Docker: the open-source application container engine
+ii  docker-ce-cli                   5:29.1.2-1~debian.12~bookworm  amd64        Docker CLI: the open-source application container engine
 ii  dpkg                            1.21.22                        amd64        Debian package management system
 ii  e2fsprogs                       1.47.0-2+b2                    amd64        ext2/ext3/ext4 file system utilities
 ii  ebtables                        2.0.11-5                       amd64        Ethernet bridge frame table administration
@@ -141,8 +141,8 @@ ii  libnftnl11:amd64                1.2.4-2                        amd64
 ii  libnghttp2-14:amd64             1.52.0-1+deb12u2               amd64        library implementing HTTP/2 protocol (shared library)
 ii  libnpth0:amd64                  1.6-3                          amd64        replacement for GNU Pth using system threads
 ii  libnsl2:amd64                   1.3.0-2                        amd64        Public client interface for NIS(YP) and NIS+
-ii  libnvidia-container-tools       1.18.0-1                       amd64        NVIDIA container runtime library (command-line tools)
-ii  libnvidia-container1:amd64      1.18.0-1                       amd64        NVIDIA container runtime library
+ii  libnvidia-container-tools       1.18.1-1                       amd64        NVIDIA container runtime library (command-line tools)
+ii  libnvidia-container1:amd64      1.18.1-1                       amd64        NVIDIA container runtime library
 ii  libp11-kit0:amd64               0.24.1-2                       amd64        library for loading and coordinating access to PKCS#11 modules - runtime
 ii  libpam-modules:amd64            1.5.2-6+deb12u1                amd64        Pluggable Authentication Modules for PAM
 ii  libpam-modules-bin              1.5.2-6+deb12u1                amd64        Pluggable Authentication Modules for PAM - helper binaries
@@ -200,8 +200,8 @@ ii  netbase                         6.4                            all
 ii  netcat-openbsd                  1.219-1                        amd64        TCP/IP swiss army knife
 ii  nfs-common                      1:2.6.2-4+deb12u1              amd64        NFS support files common to client and server
 ii  nftables                        1.0.6-2+deb12u2                amd64        Program to control packet filtering rules by Netfilter project
-ii  nvidia-container-toolkit        1.18.0-1                       amd64        NVIDIA Container toolkit
-ii  nvidia-container-toolkit-base   1.18.0-1                       amd64        NVIDIA Container Toolkit Base
+ii  nvidia-container-toolkit        1.18.1-1                       amd64        NVIDIA Container toolkit
+ii  nvidia-container-toolkit-base   1.18.1-1                       amd64        NVIDIA Container Toolkit Base
 ii  openssh-client                  1:9.2p1-2+deb12u7              amd64        secure shell (SSH) client, for secure access to remote machines
 ii  openssh-server                  1:9.2p1-2+deb12u7              amd64        secure shell (SSH) server, for secure access from remote machines
 ii  openssh-sftp-server             1:9.2p1-2+deb12u7              amd64        secure shell (SSH) sftp server module, for SFTP access from remote machines
diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go
@@ -24,10 +24,10 @@ import (
 
 const (
 	// Version is the current version of kic
-	Version = "v0.0.48-1764169655-21974"
+	Version = "v0.0.48-1764843390-22032"
 
 	// SHA of the kic base image
-	baseImageSHA = "5caa2df9c71885b15a10c4769bf4c9c00c1759c0d87b1a7e0b5b61285526245b"
+	baseImageSHA = "e0549ab5b944401a6b1b03cfbd02cd8e1f1ac2f1cf44298eab0c6846e4375164"
 	// The name of the GCR kicbase repository
 	gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
 	// The name of the Dockerhub kicbase repository
diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go
@@ -41,7 +41,7 @@ const fileScheme = "file"
 // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order
 func DefaultISOURLs() []string {
 	v := version.GetISOVersion()
-	isoBucket := "minikube-builds/iso/21924"
+	isoBucket := "minikube-builds/iso/22032"
 
 	return []string{
 		fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),
diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md
@@ -27,7 +27,7 @@ minikube start [flags]
       --apiserver-port int                The apiserver listening port (default 8443)
       --auto-pause-interval duration      Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s)
       --auto-update-drivers               If set, automatically updates drivers to the latest version. Defaults to true. (default true)
-      --base-image string                 The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.48-1764169655-21974@sha256:5caa2df9c71885b15a10c4769bf4c9c00c1759c0d87b1a7e0b5b61285526245b")
+      --base-image string                 The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.48-1764843390-22032@sha256:e0549ab5b944401a6b1b03cfbd02cd8e1f1ac2f1cf44298eab0c6846e4375164")
       --binary-mirror string              Location to fetch kubectl, kubelet, & kubeadm binaries from.
       --cache-images                      If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true)
       --cert-expiration duration          Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s)

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`################################################################################`
`6`	`6`
`7`		`-DOCKER_BIN_AARCH64_VERSION = 28.5.1`
	`7`	`+DOCKER_BIN_AARCH64_VERSION = 28.5.2`
`8`	`8`	`DOCKER_BIN_AARCH64_SITE = https://download.docker.com/linux/static/stable/aarch64`
`9`	`9`	`DOCKER_BIN_AARCH64_SOURCE = docker-$(DOCKER_BIN_AARCH64_VERSION).tgz`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`################################################################################`
`6`	`6`
`7`		`-DOCKER_BIN_VERSION = 28.5.1`
	`7`	`+DOCKER_BIN_VERSION = 28.5.2`
`8`	`8`	`DOCKER_BIN_SITE = https://download.docker.com/linux/static/stable/x86_64`
`9`	`9`	`DOCKER_BIN_SOURCE = docker-$(DOCKER_BIN_VERSION).tgz`
`10`	`10`