diff --git a/Makefile b/Makefile index 817866f96f52..74e31f76771f 100644 --- 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-1758198818-20370 +ISO_VERSION ?= v1.37.0-1760004926-21723 # 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 index 07c319d03c6f..36421c8ae04c 100644 --- 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 @@ -37,3 +37,4 @@ sha256 d3291093e8ed576ed9e237b24dc4556a9ed21ff25d4c26578df612cb6fe0480f docker- sha256 61c65bddb74ea73ba9644769ae673b9cb05b8ae66902393d6123d05a5b07ee01 docker-28.3.2.tgz sha256 db69fed523677c5a24bbc6ef2e85db07205a6af2fe8838c4db652bfff8227cfa docker-28.3.3.tgz sha256 059416f4fe7465bdedbabd6d34db524e6e3bef65f3b61caa42a3d8ca94150ed2 docker-28.4.0.tgz +sha256 de54e37157f45a43f42f6271302372d95c0eb992cc35ecaee74989bb14058c94 docker-28.5.1.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 index 7eb85a58c54c..b082a6e88cdc 100644 --- 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.4.0 +DOCKER_BIN_AARCH64_VERSION = 28.5.1 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 index 71b1e9b50831..394baca51abe 100644 --- 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 @@ -73,3 +73,4 @@ sha256 6b130fa5fb13516620d5ece0b63f63a495cede428bb2f9e24449022e9d72e0cb docker- sha256 9d274a3f330764ebd9cc82fe29e5dd5d0569bc34f9f53e3ac8905444cd88b413 docker-28.3.2.tgz sha256 40c16bcf324f354b382d07e845e6a79e3493fc0c09b252dff9e1a46125589bff docker-28.3.3.tgz sha256 21516934188f06d0e5f232cbde8112701f6d82899016240bc7a5d619f6b0059c docker-28.4.0.tgz +sha256 5c0d19f31fece1accd0358bb8cff591fe25d7b6cba19f0fd412cbfdc07f75ff6 docker-28.5.1.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 index 2bee78607122..3e1034307daa 100644 --- 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.4.0 +DOCKER_BIN_VERSION = 28.5.1 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 index fcaaf1b7c0e5..c24f8bc972ad 100644 --- a/hack/kicbase_version/os-package-list.txt +++ b/hack/kicbase_version/os-package-list.txt @@ -32,8 +32,8 @@ ii dirmngr 2.2.40-1.1+deb12u1 amd64 ii dmsetup 2:1.02.185-2 amd64 Linux Kernel Device Mapper userspace library ii dnsutils 1:9.18.33-1~deb12u2 all Transitional package for bind9-dnsutils ii docker-buildx-plugin 0.29.1-1~debian.12~bookworm amd64 Docker Buildx plugin extends build capabilities with BuildKit. -ii docker-ce 5:28.5.0-1~debian.12~bookworm amd64 Docker: the open-source application container engine -ii docker-ce-cli 5:28.5.0-1~debian.12~bookworm amd64 Docker CLI: the open-source application container engine +ii docker-ce 5:28.5.1-1~debian.12~bookworm amd64 Docker: the open-source application container engine +ii docker-ce-cli 5:28.5.1-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 diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index dd5209aec4e5..0c18cc162692 100644 --- 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-1759745255-21703" + Version = "v0.0.48-1760004990-21723" // SHA of the kic base image - baseImageSHA = "cb5cd2ea26aaf2d64a5ec385670af2f770e759461e4b662fd7a8fae305b74c92" + baseImageSHA = "42ac4bc73be115b92349c9f70d8098b5593ec393e639b0a2284a9d6a05ad63a9" // 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 index 03529a16c17d..71b33c6ddde0 100644 --- 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/20370" + isoBucket := "minikube-builds/iso/21723" 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 index 2432e9327841..2b87f03d0dbc 100644 --- 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-1759745255-21703@sha256:cb5cd2ea26aaf2d64a5ec385670af2f770e759461e4b662fd7a8fae305b74c92") + --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-1760004990-21723@sha256:42ac4bc73be115b92349c9f70d8098b5593ec393e639b0a2284a9d6a05ad63a9") --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)