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.

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 27.3.0 to 27.3.1 #19696

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \"
HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2)

# Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
ISO_VERSION ?= v1.34.0-1726784654-19672
ISO_VERSION ?= v1.34.0-1727108440-19696

# Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,4 @@ sha256 13ec868bc1df9d6a0bf6ed7c148e7d4fd6778fb254d823f62b8f6ce9bc8c9822 docker-
sha256 6a95310ef7bf48c9f138c325ba7085919e97327d08f18e8973892549fb080a6c docker-27.2.0.tgz
sha256 4e2a2ad6b888cfef5a82ab3d3299daf598a6d0bd2e4ee6c56b87b6a76bb80e34 docker-27.2.1.tgz
sha256 0d11fabe8248d4be69cd6d4bf97beefbabb7d107fbdcfd267223b74993458c7c docker-27.3.0.tgz
sha256 4da6a6c7502b7ab561675a5ff5ac192d9b49d76d0b8847cf17ade246122279f4 docker-27.3.1.tgz
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
################################################################################

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,4 @@ sha256 a7fff574037af22bd0239e7e5601c312d9fe9c55e2b9cf5ddea86d5499a4de88 docker-
sha256 3bd24d57ad188013d3ea3cc9366055452bf7a6e21756fdc0a682e80779d3c3bc docker-27.2.0.tgz
sha256 afa9895e15bd7c0cac3c57979edc5706a4d5e7ac78c902d22e3b426fedf0c8a8 docker-27.2.1.tgz
sha256 1d47501a8fd99923ad655b1b85bb24f12b66db3b0e28c6dd12000d397b4f20d6 docker-27.3.0.tgz
sha256 9b4f6fe406e50f9085ee474c451e2bb5adb119a03591f467922d3b4e2ddf31d3 docker-27.3.1.tgz
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
################################################################################

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

Expand Down
4 changes: 2 additions & 2 deletions hack/kicbase_version/os-package-list.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ ii diffutils 1:3.8-0ubuntu2 amd6
ii dirmngr 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - network certificate management service
ii dnsutils 1:9.18.28-0ubuntu0.22.04.1 all Transitional package for bind9-dnsutils
ii docker-buildx-plugin 0.17.1-1~ubuntu.22.04~jammy amd64 Docker Buildx cli plugin.
ii docker-ce 5:27.3.0-1~ubuntu.22.04~jammy amd64 Docker: the open-source application container engine
ii docker-ce-cli 5:27.3.0-1~ubuntu.22.04~jammy amd64 Docker CLI: the open-source application container engine
ii docker-ce 5:27.3.1-1~ubuntu.22.04~jammy amd64 Docker: the open-source application container engine
ii docker-ce-cli 5:27.3.1-1~ubuntu.22.04~jammy amd64 Docker CLI: the open-source application container engine
ii dpkg 1.21.1ubuntu2.3 amd64 Debian package management system
ii e2fsprogs 1.46.5-2ubuntu1.2 amd64 ext2/ext3/ext4 file system utilities
ii ebtables 2.0.11-4build2 amd64 Ethernet bridge frame table administration
Expand Down
4 changes: 2 additions & 2 deletions pkg/drivers/kic/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import (

const (
// Version is the current version of kic
Version = "v0.0.45-1726784731-19672"
Version = "v0.0.45-1727108449-19696"

// SHA of the kic base image
baseImageSHA = "7f8c62ddb0100a5b958dd19c5b5478b8c7ef13da9a0a4d6c7d18f43544e0dbed"
baseImageSHA = "c662152d8855bc4c62a3b5786a68adf99e04794e7f8f374a3859703004ef1d21"
// The name of the GCR kicbase repository
gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
// The name of the Dockerhub kicbase repository
Expand Down
2 changes: 1 addition & 1 deletion pkg/minikube/download/iso.go
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/19672"
isoBucket := "minikube-builds/iso/19696"

return []string{
fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),
Expand Down
2 changes: 1 addition & 1 deletion site/content/en/docs/commands/start.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ minikube start [flags]
--apiserver-port int The apiserver listening port (default 8443)
--auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s)
--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.45-1726784731-19672@sha256:7f8c62ddb0100a5b958dd19c5b5478b8c7ef13da9a0a4d6c7d18f43544e0dbed")
--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.45-1727108449-19696@sha256:c662152d8855bc4c62a3b5786a68adf99e04794e7f8f374a3859703004ef1d21")
--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)
Expand Down
Loading