Merge pull request #16572 from minikube-bot/auto_bump_docker_version-78b5c0f
Kicbase/ISO: Update docker from 20.10.23 to 24.0.1pull/16585/head
Steven Powell
GitHub
commit
0ae2d39845
2
Makefile
2
Makefile
|
|
@ -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.30.1-1684536668-16501
|
||||
ISO_VERSION ?= v1.30.1-1684885329-16572
|
||||
|
||||
# Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
|
||||
DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
|
||||
|
|
|
|||
|
|
@ -8,3 +8,4 @@ sha256 ef69a2a8ddb87026a8b19e240b2ae3087764b7285860df7faee24e04024f2eb7 docker-
|
|||
sha256 b4ceb6151d4dd1bfc7557f5fe0317e29cfcac91f798c34fae7dee891a811f8ee docker-20.10.21.tgz
|
||||
sha256 2c75cd6c3dc9b81cb5bde664c882e4339a2054e09cf09606f9f7dd6970e7f078 docker-20.10.22.tgz
|
||||
sha256 5c40bb7dcd1aad94be49ad75d24e7fd409119ed0eaad04f5d13c4fddfb397c8a docker-20.10.23.tgz
|
||||
sha256 7856c7ab0bc5f324391a2922781bbda503bcfbdea1d71eb2b8d871ffc7f8b468 docker-24.0.1.tgz
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
DOCKER_BIN_AARCH64_VERSION = 20.10.23
|
||||
DOCKER_BIN_AARCH64_VERSION = 24.0.1
|
||||
DOCKER_BIN_AARCH64_SITE = https://download.docker.com/linux/static/stable/aarch64
|
||||
DOCKER_BIN_AARCH64_SOURCE = docker-$(DOCKER_BIN_AARCH64_VERSION).tgz
|
||||
|
||||
|
|
|
|||
|
|
@ -44,3 +44,4 @@ sha256 a303cee9125c89abbbb6c4f044b3e2c01c7895e373b90d8de16a7ed25bb2530a docker-
|
|||
sha256 2582bed8772b283bda9d4565c0af76ee653c93d93dc6b8d0aad795d731a1bb81 docker-20.10.21.tgz
|
||||
sha256 945c3a3ddcb79ee7307496c2f39eb3d8372466e8654e63d60bbb462e4a3c1427 docker-20.10.22.tgz
|
||||
sha256 0ee39f72cc434137d294c14d30897826bad6e24979e421f51a252769ad37e6d1 docker-20.10.23.tgz
|
||||
sha256 298da71767e61b5b9bd40dda26e926d439106eab92df2cf66df6265d4046e3cf docker-24.0.1.tgz
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
DOCKER_BIN_VERSION = 20.10.23
|
||||
DOCKER_BIN_VERSION = 24.0.1
|
||||
DOCKER_BIN_SITE = https://download.docker.com/linux/static/stable/x86_64
|
||||
DOCKER_BIN_SOURCE = docker-$(DOCKER_BIN_VERSION).tgz
|
||||
|
||||
|
|
|
|||
|
|
@ -24,10 +24,10 @@ import (
|
|||
|
||||
const (
|
||||
// Version is the current version of kic
|
||||
Version = "v0.0.39-1684536746-16501"
|
||||
Version = "v0.0.39-1684885407-16572"
|
||||
|
||||
// SHA of the kic base image
|
||||
baseImageSHA = "f5d93abf1d1cfb142a7cf0b58b24029595d621e5f943105b16c61199094d77de"
|
||||
baseImageSHA = "1678a360739dac48ad7fdd0fcdfd8f9af43ced0b54ec5cd320e5a35a4c50c733"
|
||||
// The name of the GCR kicbase repository
|
||||
gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
|
||||
// The name of the Dockerhub kicbase repository
|
||||
|
|
|
|||
|
|
@ -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/16501"
|
||||
isoBucket := "minikube-builds/iso/16572"
|
||||
|
||||
return []string{
|
||||
fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ minikube start [flags]
|
|||
--apiserver-names strings A set of apiserver names which are used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine
|
||||
--apiserver-port int The apiserver listening port (default 8443)
|
||||
--auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true)
|
||||
--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.39-1684536746-16501@sha256:f5d93abf1d1cfb142a7cf0b58b24029595d621e5f943105b16c61199094d77de")
|
||||
--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.39-1684885407-16572@sha256:1678a360739dac48ad7fdd0fcdfd8f9af43ced0b54ec5cd320e5a35a4c50c733")
|
||||
--binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from.
|
||||
--cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true)
|
||||
--cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s)
|
||||
|
|
|
|||
Loading…
Reference in New Issue