From a18166a243d26f5498e1a540d45b49ddfb0d3eea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Sat, 12 Dec 2020 09:47:39 +0100 Subject: [PATCH] Upgrade buildkit from 0.7.2 to 0.8.0 Also include the custom runc version --- .../package/buildkit-bin/buildkit-bin.hash | 1 + .../package/buildkit-bin/buildkit-bin.mk | 13 ++++++++++--- deploy/kicbase/Dockerfile | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) 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 bfc3e3ad4603..e658bb83416d 100644 --- a/deploy/iso/minikube-iso/package/buildkit-bin/buildkit-bin.hash +++ b/deploy/iso/minikube-iso/package/buildkit-bin/buildkit-bin.hash @@ -1 +1,2 @@ sha256 33bcaa49b31bc3a277ac75d32fce3f5442d39f53a1799b8624e985279b579f74 buildkit-v0.7.2.linux-amd64.tar.gz +sha256 28005748fae926edf8c93b7cb1df53ec49df65dec67105b94e7fb9c513fa78a4 buildkit-v0.8.0.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 78f7f7ea3860..639c0bf2819a 100644 --- a/deploy/iso/minikube-iso/package/buildkit-bin/buildkit-bin.mk +++ b/deploy/iso/minikube-iso/package/buildkit-bin/buildkit-bin.mk @@ -4,17 +4,24 @@ # ################################################################################ -BUILDKIT_BIN_VERSION = v0.7.2 +BUILDKIT_BIN_VERSION = v0.8.0 +BUILDKIT_BIN_COMMIT = 73fe4736135645a342abc7b587bba0994cccf0f9 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 + define BUILDKIT_BIN_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 \ $(@D)/buildctl \ - $(TARGET_DIR)/usr/bin/buildctl + $(TARGET_DIR)/usr/bin + $(INSTALL) -D -m 0755 \ + $(@D)/buildkit-runc \ + $(TARGET_DIR)/usr/sbin $(INSTALL) -D -m 0755 \ $(@D)/buildkitd \ - $(TARGET_DIR)/usr/sbin/buildkitd + $(TARGET_DIR)/usr/sbin endef $(eval $(generic-package)) diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index 77fd2c3ee73a..45cd7e2e92e4 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-20201106 -ARG BUILDKIT_VERSION="v0.7.2" +ARG BUILDKIT_VERSION="v0.8.0" # copy in static files (configs, scripts) COPY 10-network-security.conf /etc/sysctl.d/10-network-security.conf