Skip to content

Commit 0950adb

Browse files
authored
Merge pull request #21488 from minikube-bot/auto_bump_docker_version-e92911b
Kicbase/ISO: Update docker from 28.3.3 to 28.4.0
2 parents bb71ed4 + 554d756 commit 0950adb

File tree

9 files changed

+12
-10
lines changed

9 files changed

+12
-10
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.36.0-1753487480-21147
27+
ISO_VERSION ?= v1.36.0-1756980912-21488
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
@@ -36,3 +36,4 @@ sha256 914f0aba14ef51dd76ef3f1f71a24e6bcf12d55bbb033289a0404988a2c3ab28 docker-
3636
sha256 d3291093e8ed576ed9e237b24dc4556a9ed21ff25d4c26578df612cb6fe0480f docker-28.0.4.tgz
3737
sha256 61c65bddb74ea73ba9644769ae673b9cb05b8ae66902393d6123d05a5b07ee01 docker-28.3.2.tgz
3838
sha256 db69fed523677c5a24bbc6ef2e85db07205a6af2fe8838c4db652bfff8227cfa docker-28.3.3.tgz
39+
sha256 059416f4fe7465bdedbabd6d34db524e6e3bef65f3b61caa42a3d8ca94150ed2 docker-28.4.0.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.3.3
7+
DOCKER_BIN_AARCH64_VERSION = 28.4.0
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
@@ -72,3 +72,4 @@ sha256 5ed6d86b5d78199eac0dbcd4d81e6de6545bc8c8a575b6efc1d4a4b292824746 docker-
7272
sha256 6b130fa5fb13516620d5ece0b63f63a495cede428bb2f9e24449022e9d72e0cb docker-28.0.4.tgz
7373
sha256 9d274a3f330764ebd9cc82fe29e5dd5d0569bc34f9f53e3ac8905444cd88b413 docker-28.3.2.tgz
7474
sha256 40c16bcf324f354b382d07e845e6a79e3493fc0c09b252dff9e1a46125589bff docker-28.3.3.tgz
75+
sha256 21516934188f06d0e5f232cbde8112701f6d82899016240bc7a5d619f6b0059c docker-28.4.0.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.3.3
7+
DOCKER_BIN_VERSION = 28.4.0
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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ ii debianutils 5.5-1ubuntu2 amd6
3131
ii diffutils 1:3.8-0ubuntu2 amd64 File comparison utilities
3232
ii dirmngr 2.2.27-3ubuntu2.4 amd64 GNU privacy guard - network certificate management service
3333
ii dnsutils 1:9.18.30-0ubuntu0.22.04.2 all Transitional package for bind9-dnsutils
34-
ii docker-buildx-plugin 0.26.1-1~ubuntu.22.04~jammy amd64 Docker Buildx cli plugin.
35-
ii docker-ce 5:28.3.3-1~ubuntu.22.04~jammy amd64 Docker: the open-source application container engine
36-
ii docker-ce-cli 5:28.3.3-1~ubuntu.22.04~jammy amd64 Docker CLI: the open-source application container engine
34+
ii docker-buildx-plugin 0.27.0-1~ubuntu.22.04~jammy amd64 Docker Buildx cli plugin.
35+
ii docker-ce 5:28.4.0-1~ubuntu.22.04~jammy amd64 Docker: the open-source application container engine
36+
ii docker-ce-cli 5:28.4.0-1~ubuntu.22.04~jammy amd64 Docker CLI: the open-source application container engine
3737
ii dpkg 1.21.1ubuntu2.3 amd64 Debian package management system
3838
ii e2fsprogs 1.46.5-2ubuntu1.2 amd64 ext2/ext3/ext4 file system utilities
3939
ii ebtables 2.0.11-4build2 amd64 Ethernet bridge frame table administration

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.47-1756116447-21413"
27+
Version = "v0.0.47-1756980985-21488"
2828

2929
// SHA of the kic base image
30-
baseImageSHA = "0420dcb4b989a4f3e21680d5952b2239e0fcff16c7f6520d036ddb10d7c257d9"
30+
baseImageSHA = "8004ef31c95f43ea4d909587f47b84b33af26368a459c00cd53d571affb59c79"
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/21147"
44+
isoBucket := "minikube-builds/iso/21488"
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.47-1756116447-21413@sha256:0420dcb4b989a4f3e21680d5952b2239e0fcff16c7f6520d036ddb10d7c257d9")
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.47-1756980985-21488@sha256:8004ef31c95f43ea4d909587f47b84b33af26368a459c00cd53d571affb59c79")
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)