Skip to content

Commit 05b64d1

Browse files
authored
Merge pull request #11824 from andriyDev/fix-auto-pause
Make kicbase copy auto-pause binary instead of auto-pause folder
2 parents 86306dc + 2bf9076 commit 05b64d1

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

deploy/kicbase/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ COPY deploy/kicbase/10-network-security.conf /etc/sysctl.d/10-network-security.c
3636
COPY deploy/kicbase/11-tcp-mtu-probing.conf /etc/sysctl.d/11-tcp-mtu-probing.conf
3737
COPY deploy/kicbase/clean-install /usr/local/bin/clean-install
3838
COPY deploy/kicbase/entrypoint /usr/local/bin/entrypoint
39-
COPY --from=0 /src/cmd/auto-pause /bin/auto-pause
39+
COPY --from=0 /src/cmd/auto-pause/auto-pause /bin/auto-pause
4040

4141
# Install dependencies, first from apt, then from release tarballs.
4242
# NOTE: we use one RUN to minimize layers.

pkg/drivers/kic/types.go

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

2525
const (
2626
// Version is the current version of kic
27-
Version = "v0.0.24"
27+
Version = "v0.0.24-1625086337-11824"
2828
// SHA of the kic base image
29-
baseImageSHA = "ba324e0dc025040a8ea6b883d008ec4a43a47db106fb59ac7446982c20c2cdc5"
29+
baseImageSHA = "9e7c8040758103e42825d78af47706a9c18b1aab2659eeac30eb417757b9b42a"
3030
// The name of the GCR kicbase repository
31-
gcrRepo = "gcr.io/k8s-minikube/kicbase"
31+
gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
3232
// The name of the Dockerhub kicbase repository
33-
dockerhubRepo = "kicbase/stable"
33+
dockerhubRepo = "kicbase/build"
3434
)
3535

3636
var (

site/content/en/docs/commands/start.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ minikube start [flags]
2626
--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
2727
--apiserver-port int The apiserver listening port (default 8443)
2828
--auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true)
29-
--base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase:v0.0.24@sha256:ba324e0dc025040a8ea6b883d008ec4a43a47db106fb59ac7446982c20c2cdc5")
29+
--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.24-1625086337-11824@sha256:9e7c8040758103e42825d78af47706a9c18b1aab2659eeac30eb417757b9b42a")
3030
--cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true)
3131
--cni string CNI plug-in to use. Valid options: auto, bridge, calico, cilium, flannel, kindnet, or path to a CNI manifest (default: auto)
3232
--container-runtime string The container runtime to be used (docker, cri-o, containerd). (default "docker")

0 commit comments

Comments
 (0)