From 268743ce4c5ba0beecf537a95bef375575b655cc Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 18 Dec 2023 14:25:09 -0800 Subject: [PATCH 1/3] Kicbase: Fix modifying Docker binfmt config --- deploy/kicbase/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index 7a0685108e..00f575d269 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -41,6 +41,9 @@ RUN if [ "$PREBUILT_AUTO_PAUSE" != "true" ]; then cd ./cmd/auto-pause/ && go bui # for a kubernetes node image, it doesn't contain much we don't need FROM ${UBUNTU_JAMMY_IMAGE} as kicbase +# delete this file due to https://github.com/kubernetes/minikube/issues/17700 +RUN rm -f /usr/lib/binfmt.d/python3.10.conf + ARG BUILDKIT_VERSION="v0.12.4" ARG CRIO_VERSION="1.24" ARG CRI_DOCKERD_VERSION="v0.3.3" From c504a2442a957bdda4f9121d94f13c07b14a1d22 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 20 Dec 2023 07:28:05 -0800 Subject: [PATCH 2/3] move python binfmt removal after systemd install --- deploy/kicbase/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index 00f575d269..bd1f78294b 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -41,9 +41,6 @@ RUN if [ "$PREBUILT_AUTO_PAUSE" != "true" ]; then cd ./cmd/auto-pause/ && go bui # for a kubernetes node image, it doesn't contain much we don't need FROM ${UBUNTU_JAMMY_IMAGE} as kicbase -# delete this file due to https://github.com/kubernetes/minikube/issues/17700 -RUN rm -f /usr/lib/binfmt.d/python3.10.conf - ARG BUILDKIT_VERSION="v0.12.4" ARG CRIO_VERSION="1.24" ARG CRI_DOCKERD_VERSION="v0.3.3" @@ -117,6 +114,8 @@ RUN echo "Ensuring scripts are executable ..." \ && echo "Modifying /etc/nsswitch.conf to prefer hosts" \ && sed -i /etc/nsswitch.conf -re 's#^(hosts:\s*).*#\1dns files#' +# delete this file due to https://github.com/kubernetes/minikube/issues/17700 +RUN rm -f /usr/lib/binfmt.d/python3.10.conf ARG COMMIT_SHA # using base image created by kind https://github.com/kubernetes-sigs/kind/blob/b6bc1125/images/base/Dockerfile From f2d99d5d3acbee63fb92e6e0c0b75bbff35f3ad4 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 8 Jan 2024 22:27:48 +0000 Subject: [PATCH 3/3] Updating kicbase image to v0.0.42-1704751654-17830 --- pkg/drivers/kic/types.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 1976eae5ce..c7a80e0f40 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,10 +24,10 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.42-1703498848-17857" + Version = "v0.0.42-1704751654-17830" // SHA of the kic base image - baseImageSHA = "81ae12a49915e4f02aa382dd3758a30a6649e1143c32b3d03309750104577c6c" + baseImageSHA = "cabd32f8d9e8d804966eb117ed5366660f6363a4d1415f0b5480de6e396be617" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 7f79a30fbe..64dcf35114 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -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). To disable, set to 0s (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.42-1703498848-17857@sha256:81ae12a49915e4f02aa382dd3758a30a6649e1143c32b3d03309750104577c6c") + --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.42-1704751654-17830@sha256:cabd32f8d9e8d804966eb117ed5366660f6363a4d1415f0b5480de6e396be617") --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)