Skip to content

Commit dce1849

Browse files
authored
Kicbase/ISO: Update docker from 28.0.4 to 28.3.2 (#21053)
* Kicbase/ISO: Update docker from 28.0.4 to 28.3.2 * Updating kicbase image to v0.0.47-1752142599-21053 * Updating ISO to v1.36.0-1752142514-21053
1 parent d4374c4 commit dce1849

File tree

9 files changed

+45
-43
lines changed

9 files changed

+45
-43
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-1751445739-20995
27+
ISO_VERSION ?= v1.36.0-1752142514-21053
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
@@ -34,3 +34,4 @@ sha256 30885dd4e0dec8451d7e089242da77a5612822dcb5151c44d3d7193cb1e4d378 docker-
3434
sha256 2d8671dc70f5d71415ea9add4daa14b022b134fa5bac248cdbc3dfa5e88c0a5a docker-28.0.0.tgz
3535
sha256 914f0aba14ef51dd76ef3f1f71a24e6bcf12d55bbb033289a0404988a2c3ab28 docker-28.0.1.tgz
3636
sha256 d3291093e8ed576ed9e237b24dc4556a9ed21ff25d4c26578df612cb6fe0480f docker-28.0.4.tgz
37+
sha256 61c65bddb74ea73ba9644769ae673b9cb05b8ae66902393d6123d05a5b07ee01 docker-28.3.2.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.0.4
7+
DOCKER_BIN_AARCH64_VERSION = 28.3.2
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
@@ -70,3 +70,4 @@ sha256 64bb136b612a7bca537ef99b50504e4250cb71117c2d26552d20cda122b6c5b4 docker-
7070
sha256 0ac653c8d2503ee814471ac1df4a82c14c6d3ac69f6cef175d7a88a4ceeb6cfc docker-28.0.0.tgz
7171
sha256 5ed6d86b5d78199eac0dbcd4d81e6de6545bc8c8a575b6efc1d4a4b292824746 docker-28.0.1.tgz
7272
sha256 6b130fa5fb13516620d5ece0b63f63a495cede428bb2f9e24449022e9d72e0cb docker-28.0.4.tgz
73+
sha256 9d274a3f330764ebd9cc82fe29e5dd5d0569bc34f9f53e3ac8905444cd88b413 docker-28.3.2.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.0.4
7+
DOCKER_BIN_VERSION = 28.3.2
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: 34 additions & 34 deletions
Large diffs are not rendered by default.

pkg/drivers/kic/types.go

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

2525
const (
2626
// Version is the current version of kic
27-
Version = "v0.0.47"
27+
Version = "v0.0.47-1752142599-21053"
2828

2929
// SHA of the kic base image
30-
baseImageSHA = "6ed579c9292b4370177b7ef3c42cc4b4a6dcd0735a1814916cbc22c8bf38412b"
30+
baseImageSHA = "e2822af5ea7d0400a0ca62d493a67b98beb48d0f1795200b6d041019875ac577"
3131
// The name of the GCR kicbase repository
32-
gcrRepo = "gcr.io/k8s-minikube/kicbase"
32+
gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
3333
// The name of the Dockerhub kicbase repository
34-
dockerhubRepo = "docker.io/kicbase/stable"
34+
dockerhubRepo = "docker.io/kicbase/build"
3535
)
3636

3737
var (

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/20995"
44+
isoBucket := "minikube-builds/iso/21053"
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:v0.0.47@sha256:6ed579c9292b4370177b7ef3c42cc4b4a6dcd0735a1814916cbc22c8bf38412b")
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-1752142599-21053@sha256:e2822af5ea7d0400a0ca62d493a67b98beb48d0f1795200b6d041019875ac577")
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)