Skip to content

Commit c5fc796

Browse files
authored
Merge pull request #18993 from minikube-bot/auto_bump_docker_version-8754ae7
Kicbase/ISO: Update docker from 26.0.2 to 26.1.3
2 parents 5fb5cb2 + 6e7eb36 commit c5fc796

File tree

8 files changed

+9
-7
lines changed

8 files changed

+9
-7
lines changed

Makefile

+1-1
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.33.1-1716398070-18934
27+
ISO_VERSION ?= v1.33.1-1717064107-18993
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

+1
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ sha256 ce7b2ffb522cde59f2bb4b67a17db4aaf66b058532effcd583ab85d02ede529f docker-
1818
sha256 f01642695115d8ceca64772ea65336ef7210ddc36096f1e533145f443bc718b3 docker-26.0.0.tgz
1919
sha256 ffb86d77f764e544fe9dcf1c10296adebb7db01a18a5b9bce7d41814d852a8f4 docker-26.0.1.tgz
2020
sha256 daf6326d790e114db759733f88ebe8a4d0dc56abf0e810fe62548c5f8e054b56 docker-26.0.2.tgz
21+
sha256 751e0806aa8e80aa16b076ff91e4311f41b69394fdab84ca57cf5115192c3f52 docker-26.1.3.tgz

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
DOCKER_BIN_AARCH64_VERSION = 26.0.2
7+
DOCKER_BIN_AARCH64_VERSION = 26.1.3
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

+1
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,4 @@ sha256 23db817b99aac6d5d7fcb1f706e50b5a412d78a9438975d6b4a54c58dc409bfb docker-
5454
sha256 d69e8eedc72d6d219933ab53b8e7f2dbd9e64695d5db68a2df17333db433c456 docker-26.0.0.tgz
5555
sha256 d362e648f6a7cccbe313145864d2316ab3114abb22c15a685427ebd5cb306078 docker-26.0.1.tgz
5656
sha256 118a556898671cceb4d5d726b9114ca5cbbae5b5956716eb92f465932f1c6363 docker-26.0.2.tgz
57+
sha256 a50076d372d3bbe955664707af1a4ce4f5df6b2d896e68b12ecc74e724d1db31 docker-26.1.3.tgz

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

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

pkg/drivers/kic/types.go

+2-2
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.44-1716228441-18934"
27+
Version = "v0.0.44-1717064182-18993"
2828

2929
// SHA of the kic base image
30-
baseImageSHA = "628b3f20803bc9c4302fd048087dd36cf2ff5dc9ab0ded395ec3288e2f1d0862"
30+
baseImageSHA = "3a387c96177e9955c294c0075fa1bc1a6749e84c13a60790a7aa88df95e1367c"
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

+1-1
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/18934"
44+
isoBucket := "minikube-builds/iso/18993"
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

+1-1
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.44-1716228441-18934@sha256:628b3f20803bc9c4302fd048087dd36cf2ff5dc9ab0ded395ec3288e2f1d0862")
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.44-1717064182-18993@sha256:3a387c96177e9955c294c0075fa1bc1a6749e84c13a60790a7aa88df95e1367c")
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)