diff --git a/deploy/iso/minikube-iso/package/buildkit-bin/buildkit-bin.hash b/deploy/iso/minikube-iso/package/buildkit-bin/buildkit-bin.hash index afdb28733b51..2993ed2c5947 100644 --- a/deploy/iso/minikube-iso/package/buildkit-bin/buildkit-bin.hash +++ b/deploy/iso/minikube-iso/package/buildkit-bin/buildkit-bin.hash @@ -1,3 +1,4 @@ sha256 33bcaa49b31bc3a277ac75d32fce3f5442d39f53a1799b8624e985279b579f74 buildkit-v0.7.2.linux-amd64.tar.gz sha256 28005748fae926edf8c93b7cb1df53ec49df65dec67105b94e7fb9c513fa78a4 buildkit-v0.8.0.linux-amd64.tar.gz sha256 e0438a701d4192f80b2211b0a333984ee4f097c547904e40fc941daad57fe153 buildkit-v0.8.1.linux-amd64.tar.gz +sha256 d6d1ebc68806e626f31dd4ea17a406a93dcff14763971cd91b28cbaf3bfffcd4 buildkit-v0.8.2.linux-amd64.tar.gz diff --git a/deploy/iso/minikube-iso/package/buildkit-bin/buildkit-bin.mk b/deploy/iso/minikube-iso/package/buildkit-bin/buildkit-bin.mk index 624b17bf0848..ba2879dd1fa7 100644 --- a/deploy/iso/minikube-iso/package/buildkit-bin/buildkit-bin.mk +++ b/deploy/iso/minikube-iso/package/buildkit-bin/buildkit-bin.mk @@ -4,13 +4,13 @@ # ################################################################################ -BUILDKIT_BIN_VERSION = v0.8.1 -BUILDKIT_BIN_COMMIT = 8142d66b5ebde79846b869fba30d9d30633e74aa +BUILDKIT_BIN_VERSION = v0.8.2 +BUILDKIT_BIN_COMMIT = 9065b18ba4633c75862befca8188de4338d9f94a BUILDKIT_BIN_SITE = https://github.com/moby/buildkit/releases/download/$(BUILDKIT_BIN_VERSION) BUILDKIT_BIN_SOURCE = buildkit-$(BUILDKIT_BIN_VERSION).linux-amd64.tar.gz # https://github.com/opencontainers/runc.git -BUILDKIT_RUNC_VERSION = 939ad4e3fcfa1ab531458355a73688c6f4ee5003 +BUILDKIT_RUNC_VERSION = 12644e614e25b05da6fd08a38ffa0cfe1903fdec define BUILDKIT_BIN_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 \ @@ -19,6 +19,9 @@ define BUILDKIT_BIN_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 \ $(@D)/buildkit-runc \ $(TARGET_DIR)/usr/sbin + $(INSTALL) -D -m 0755 \ + $(@D)/buildkit-qemu-* \ + $(TARGET_DIR)/usr/sbin $(INSTALL) -D -m 0755 \ $(@D)/buildkitd \ $(TARGET_DIR)/usr/sbin diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index 137fedbc5da9..1ab0c7449ff7 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -21,7 +21,7 @@ # for a kubernetes node image, it doesn't contain much we don't need FROM ubuntu:focal-20210119 -ARG BUILDKIT_VERSION="v0.8.1" +ARG BUILDKIT_VERSION="v0.8.2" # copy in static files (configs, scripts) COPY 10-network-security.conf /etc/sysctl.d/10-network-security.conf @@ -121,6 +121,7 @@ RUN export ARCH=$(dpkg --print-architecture | sed 's/ppc64el/ppc64le/' | sed 's/ && rm -rf /tmp/buildkit.tgz \ && chmod 755 /usr/local/bin/buildctl \ && chmod 755 /usr/local/bin/buildkit-runc \ + && chmod 755 /usr/local/bin/buildkit-qemu-* \ && chmod 755 /usr/local/bin/buildkitd # Install cri-o/podman dependencies: