Skip to content

Commit 4493572

Browse files
committed
Upgrade buildkit from 0.8.1 to 0.8.2
Add buildkit-qemu-* to the packaging
1 parent fffa698 commit 4493572

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
sha256 33bcaa49b31bc3a277ac75d32fce3f5442d39f53a1799b8624e985279b579f74 buildkit-v0.7.2.linux-amd64.tar.gz
22
sha256 28005748fae926edf8c93b7cb1df53ec49df65dec67105b94e7fb9c513fa78a4 buildkit-v0.8.0.linux-amd64.tar.gz
33
sha256 e0438a701d4192f80b2211b0a333984ee4f097c547904e40fc941daad57fe153 buildkit-v0.8.1.linux-amd64.tar.gz
4+
sha256 d6d1ebc68806e626f31dd4ea17a406a93dcff14763971cd91b28cbaf3bfffcd4 buildkit-v0.8.2.linux-amd64.tar.gz

deploy/iso/minikube-iso/package/buildkit-bin/buildkit-bin.mk

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
#
55
################################################################################
66

7-
BUILDKIT_BIN_VERSION = v0.8.1
8-
BUILDKIT_BIN_COMMIT = 8142d66b5ebde79846b869fba30d9d30633e74aa
7+
BUILDKIT_BIN_VERSION = v0.8.2
8+
BUILDKIT_BIN_COMMIT = 9065b18ba4633c75862befca8188de4338d9f94a
99
BUILDKIT_BIN_SITE = https://github.com/moby/buildkit/releases/download/$(BUILDKIT_BIN_VERSION)
1010
BUILDKIT_BIN_SOURCE = buildkit-$(BUILDKIT_BIN_VERSION).linux-amd64.tar.gz
1111

1212
# https://github.com/opencontainers/runc.git
13-
BUILDKIT_RUNC_VERSION = 939ad4e3fcfa1ab531458355a73688c6f4ee5003
13+
BUILDKIT_RUNC_VERSION = 12644e614e25b05da6fd08a38ffa0cfe1903fdec
1414

1515
define BUILDKIT_BIN_INSTALL_TARGET_CMDS
1616
$(INSTALL) -D -m 0755 \
@@ -19,6 +19,9 @@ define BUILDKIT_BIN_INSTALL_TARGET_CMDS
1919
$(INSTALL) -D -m 0755 \
2020
$(@D)/buildkit-runc \
2121
$(TARGET_DIR)/usr/sbin
22+
$(INSTALL) -D -m 0755 \
23+
$(@D)/buildkit-qemu-* \
24+
$(TARGET_DIR)/usr/sbin
2225
$(INSTALL) -D -m 0755 \
2326
$(@D)/buildkitd \
2427
$(TARGET_DIR)/usr/sbin

deploy/kicbase/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
# for a kubernetes node image, it doesn't contain much we don't need
2222
FROM ubuntu:focal-20210119
2323

24-
ARG BUILDKIT_VERSION="v0.8.1"
24+
ARG BUILDKIT_VERSION="v0.8.2"
2525

2626
# copy in static files (configs, scripts)
2727
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/
121121
&& rm -rf /tmp/buildkit.tgz \
122122
&& chmod 755 /usr/local/bin/buildctl \
123123
&& chmod 755 /usr/local/bin/buildkit-runc \
124+
&& chmod 755 /usr/local/bin/buildkit-qemu-* \
124125
&& chmod 755 /usr/local/bin/buildkitd
125126

126127
# Install cri-o/podman dependencies:

0 commit comments

Comments
 (0)