Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kicbase/ISO: Update docker from 24.0.6 to 24.0.7 #17545

Merged
merged 2 commits into from
Nov 3, 2023
Merged

Kicbase/ISO: Update docker from 24.0.6 to 24.0.7 #17545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67b3e89
Kicbase/ISO: Update docker from 24.0.6 to 24.0.7
minikube-bot Nov 2, 2023
52a7e2b
Updating ISO to v1.32.0-1698920115-17545
minikube-bot Nov 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ KUBERNETES_VERSION ?= $(shell egrep "DefaultKubernetesVersion =" pkg/minikube/co
KIC_VERSION ?= $(shell egrep "Version =" pkg/drivers/kic/types.go | cut -d \" -f2)

# Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
ISO_VERSION ?= v1.32.0-1698773592-17486
ISO_VERSION ?= v1.32.0-1698920115-17545

# Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
Expand Down
1 change: 1 addition & 0 deletions deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ sha256 0031d3dc42d94df846743ab59c07e3303bccf3bc26fc6d3e981b13e035babf81 docker-
sha256 193a8e1f051adce6a30a4c8486ce9b39929b9633a0da8c96444c9239859f4354 docker-24.0.4.tgz
sha256 ba911d9ff8a54a7afc8f91e998984f78a704bcb4932134c4dda2c401209a9921 docker-24.0.5.tgz
sha256 d9f58aecc42451503e82e6e0562cafa1812b334c92186a7f486e111e70a0f5bd docker-24.0.6.tgz
sha256 fe6cf4b509307665af542a89454c2ecfbbd62670fc5a5d17bac7150a6f6a6776 docker-24.0.7.tgz
2 changes: 1 addition & 1 deletion deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
################################################################################

DOCKER_BIN_AARCH64_VERSION = 24.0.6
DOCKER_BIN_AARCH64_VERSION = 24.0.7
DOCKER_BIN_AARCH64_SITE = https://download.docker.com/linux/static/stable/aarch64
DOCKER_BIN_AARCH64_SOURCE = docker-$(DOCKER_BIN_AARCH64_VERSION).tgz

Expand Down
1 change: 1 addition & 0 deletions deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,4 @@ sha256 fc07577bc0abdcdc02948493cd30b36cf0b096213fade9a7e699132c06c2e34c docker-
sha256 0ab79ae5f19e2ef5bdc3c3009c8b770dea6189e0f1e0ef4935d78fd30519b11d docker-24.0.4.tgz
sha256 0a5f3157ce25532c5c1261a97acf3b25065cfe25940ef491fa01d5bea18ddc86 docker-24.0.5.tgz
sha256 99792dec613df93169a118b05312a722a63604b868e4c941b1b436abcf3bb70f docker-24.0.6.tgz
sha256 984d59a77fa6acab97ea725a966facd33725e0e09c2fee975397fe1c6379bd3d docker-24.0.7.tgz
2 changes: 1 addition & 1 deletion deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
################################################################################

DOCKER_BIN_VERSION = 24.0.6
DOCKER_BIN_VERSION = 24.0.7
DOCKER_BIN_SITE = https://download.docker.com/linux/static/stable/x86_64
DOCKER_BIN_SOURCE = docker-$(DOCKER_BIN_VERSION).tgz

Expand Down
2 changes: 1 addition & 1 deletion pkg/minikube/download/iso.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/17486"
isoBucket := "minikube-builds/iso/17545"

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