Skip to content

Commit 515553f

Browse files
authored
Merge pull request #21757 from minikube-bot/auto_bump_docker_version-709c2fe
Kicbase/ISO: Update docker from 28.4.0 to 28.5.1
2 parents d76cd28 + f9001b3 commit 515553f

File tree

9 files changed

+13
-11
lines changed

9 files changed

+13
-11
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \"
2424
HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2)
2525

2626
# Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
27-
ISO_VERSION ?= v1.37.0-1758198818-20370
27+
ISO_VERSION ?= v1.37.0-1760609724-21757
2828

2929
# Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
3030
DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))

deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,4 @@ sha256 d3291093e8ed576ed9e237b24dc4556a9ed21ff25d4c26578df612cb6fe0480f docker-
3737
sha256 61c65bddb74ea73ba9644769ae673b9cb05b8ae66902393d6123d05a5b07ee01 docker-28.3.2.tgz
3838
sha256 db69fed523677c5a24bbc6ef2e85db07205a6af2fe8838c4db652bfff8227cfa docker-28.3.3.tgz
3939
sha256 059416f4fe7465bdedbabd6d34db524e6e3bef65f3b61caa42a3d8ca94150ed2 docker-28.4.0.tgz
40+
sha256 de54e37157f45a43f42f6271302372d95c0eb992cc35ecaee74989bb14058c94 docker-28.5.1.tgz

deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
DOCKER_BIN_AARCH64_VERSION = 28.4.0
7+
DOCKER_BIN_AARCH64_VERSION = 28.5.1
88
DOCKER_BIN_AARCH64_SITE = https://download.docker.com/linux/static/stable/aarch64
99
DOCKER_BIN_AARCH64_SOURCE = docker-$(DOCKER_BIN_AARCH64_VERSION).tgz
1010

deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,4 @@ sha256 6b130fa5fb13516620d5ece0b63f63a495cede428bb2f9e24449022e9d72e0cb docker-
7373
sha256 9d274a3f330764ebd9cc82fe29e5dd5d0569bc34f9f53e3ac8905444cd88b413 docker-28.3.2.tgz
7474
sha256 40c16bcf324f354b382d07e845e6a79e3493fc0c09b252dff9e1a46125589bff docker-28.3.3.tgz
7575
sha256 21516934188f06d0e5f232cbde8112701f6d82899016240bc7a5d619f6b0059c docker-28.4.0.tgz
76+
sha256 5c0d19f31fece1accd0358bb8cff591fe25d7b6cba19f0fd412cbfdc07f75ff6 docker-28.5.1.tgz

deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
DOCKER_BIN_VERSION = 28.4.0
7+
DOCKER_BIN_VERSION = 28.5.1
88
DOCKER_BIN_SITE = https://download.docker.com/linux/static/stable/x86_64
99
DOCKER_BIN_SOURCE = docker-$(DOCKER_BIN_VERSION).tgz
1010

hack/kicbase_version/os-package-list.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ ii libnghttp2-14:amd64 1.52.0-1+deb12u2 amd64
144144
ii libnl-3-200:amd64 3.7.0-0.2+b1 amd64 library for dealing with netlink sockets
145145
ii libnpth0:amd64 1.6-3 amd64 replacement for GNU Pth using system threads
146146
ii libnsl2:amd64 1.3.0-2 amd64 Public client interface for NIS(YP) and NIS+
147-
ii libnvidia-container-tools 1.17.8-1 amd64 NVIDIA container runtime library (command-line tools)
148-
ii libnvidia-container1:amd64 1.17.8-1 amd64 NVIDIA container runtime library
147+
ii libnvidia-container-tools 1.17.9-1 amd64 NVIDIA container runtime library (command-line tools)
148+
ii libnvidia-container1:amd64 1.17.9-1 amd64 NVIDIA container runtime library
149149
ii libp11-kit0:amd64 0.24.1-2 amd64 library for loading and coordinating access to PKCS#11 modules - runtime
150150
ii libpam-modules:amd64 1.5.2-6+deb12u1 amd64 Pluggable Authentication Modules for PAM
151151
ii libpam-modules-bin 1.5.2-6+deb12u1 amd64 Pluggable Authentication Modules for PAM - helper binaries
@@ -203,8 +203,8 @@ ii ncurses-bin 6.4-4 amd64
203203
ii netbase 6.4 all Basic TCP/IP networking system
204204
ii netcat-openbsd 1.219-1 amd64 TCP/IP swiss army knife
205205
ii nfs-common 1:2.6.2-4+deb12u1 amd64 NFS support files common to client and server
206-
ii nvidia-container-toolkit 1.17.8-1 amd64 NVIDIA Container toolkit
207-
ii nvidia-container-toolkit-base 1.17.8-1 amd64 NVIDIA Container Toolkit Base
206+
ii nvidia-container-toolkit 1.17.9-1 amd64 NVIDIA Container toolkit
207+
ii nvidia-container-toolkit-base 1.17.9-1 amd64 NVIDIA Container Toolkit Base
208208
ii openssh-client 1:9.2p1-2+deb12u7 amd64 secure shell (SSH) client, for secure access to remote machines
209209
ii openssh-server 1:9.2p1-2+deb12u7 amd64 secure shell (SSH) server, for secure access from remote machines
210210
ii openssh-sftp-server 1:9.2p1-2+deb12u7 amd64 secure shell (SSH) sftp server module, for SFTP access from remote machines

pkg/drivers/kic/types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import (
2424

2525
const (
2626
// Version is the current version of kic
27-
Version = "v0.0.48-1760363564-21724"
27+
Version = "v0.0.48-1760609789-21757"
2828

2929
// SHA of the kic base image
30-
baseImageSHA = "3d243c9fb0952e24526c917e5809c5ed926108eae97e8156b6e33fc1d2564225"
30+
baseImageSHA = "9824b20f4774128fcb298ad0e6cac7649729886cfba9d444b2305c743a5044c6"
3131
// The name of the GCR kicbase repository
3232
gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
3333
// The name of the Dockerhub kicbase repository

pkg/minikube/download/iso.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const fileScheme = "file"
4141
// DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order
4242
func DefaultISOURLs() []string {
4343
v := version.GetISOVersion()
44-
isoBucket := "minikube-builds/iso/20370"
44+
isoBucket := "minikube-builds/iso/21757"
4545

4646
return []string{
4747
fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),

site/content/en/docs/commands/start.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ minikube start [flags]
2727
--apiserver-port int The apiserver listening port (default 8443)
2828
--auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s)
2929
--auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true)
30-
--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-1760363564-21724@sha256:3d243c9fb0952e24526c917e5809c5ed926108eae97e8156b6e33fc1d2564225")
30+
--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-1760609789-21757@sha256:9824b20f4774128fcb298ad0e6cac7649729886cfba9d444b2305c743a5044c6")
3131
--binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from.
3232
--cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true)
3333
--cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s)

0 commit comments

Comments
 (0)