diff --git a/deploy/iso/minikube-iso/Dockerfile b/deploy/iso/minikube-iso/Dockerfile index d137dcfac4c0..3b9a94f96b8f 100644 --- a/deploy/iso/minikube-iso/Dockerfile +++ b/deploy/iso/minikube-iso/Dockerfile @@ -34,6 +34,7 @@ RUN apt-get update \ rsync \ dumb-init \ golang-go \ + libpcre3-dev \ && rm -rf /var/lib/apt/lists/* RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 diff --git a/deploy/iso/minikube-iso/package/cri-tools/cri-tools.hash b/deploy/iso/minikube-iso/package/cri-tools/cri-tools.hash index dac949a4dff8..d7f565634202 100644 --- a/deploy/iso/minikube-iso/package/cri-tools/cri-tools.hash +++ b/deploy/iso/minikube-iso/package/cri-tools/cri-tools.hash @@ -1,3 +1 @@ -sha256 e83b5a8ff6fc2c98c3463600e74a86d7dbbea6330f883cd5663cbd59641a8086 v0.2.tar.gz -sha256 2c8e45414d5804628f557171d622ca3e4a55dfc1f2de0cd33bcba98e863342d1 v1.0.0-alpha.0.tar.gz -sha256 688cd566e11f09247e8135ac1ee65e5afb3ea3303c00569c5e1e265e3b2c68f6 v1.0.0-beta.0.tar.gz +sha256 a357c67c891896032865f7a34f7ec330e5a00fe7f20b6d8be50399b91c99a4ac v1.11.1.tar.gz diff --git a/deploy/iso/minikube-iso/package/cri-tools/cri-tools.mk b/deploy/iso/minikube-iso/package/cri-tools/cri-tools.mk index 48d740659703..a957f186aea2 100644 --- a/deploy/iso/minikube-iso/package/cri-tools/cri-tools.mk +++ b/deploy/iso/minikube-iso/package/cri-tools/cri-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -CRI_TOOLS_VERSION = v1.0.0-beta.0 +CRI_TOOLS_VERSION = v1.11.1 CRI_TOOLS_SITE = https://github.com/kubernetes-incubator/cri-tools/archive CRI_TOOLS_SOURCE = $(CRI_TOOLS_VERSION).tar.gz CRI_TOOLS_LICENSE = Apache-2.0 @@ -14,6 +14,7 @@ CRI_TOOLS_GOPATH = $(@D)/_output CRI_TOOLS_ENV = \ CGO_ENABLED=1 \ GOPATH="$(CRI_TOOLS_GOPATH)" \ + GOBIN="$(CRI_TOOLS_GOPATH)/bin" \ PATH=$(CRI_TOOLS_GOPATH)/bin:$(BR_PATH) diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk index 529554185a78..73231183f7aa 100644 --- a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk +++ b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk @@ -12,6 +12,7 @@ CRIO_BIN_GOPATH = $(@D)/_output CRIO_BIN_ENV = \ CGO_ENABLED=1 \ GOPATH="$(CRIO_BIN_GOPATH)" \ + GOBIN="$(CRIO_BIN_GOPATH)/bin" \ PATH=$(CRIO_BIN_GOPATH)/bin:$(BR_PATH) diff --git a/deploy/iso/minikube-iso/package/kpod/kpod.mk b/deploy/iso/minikube-iso/package/kpod/kpod.mk index 97f631801d8a..54f19aa9ea05 100644 --- a/deploy/iso/minikube-iso/package/kpod/kpod.mk +++ b/deploy/iso/minikube-iso/package/kpod/kpod.mk @@ -10,6 +10,7 @@ KPOD_GOPATH = $(@D)/_output KPOD_BIN_ENV = \ CGO_ENABLED=1 \ GOPATH="$(KPOD_GOPATH)" \ + GOBIN="$(KPOD_GOPATH)/bin" \ PATH=$(KPOD_GOPATH)/bin:$(BR_PATH)