From 841dccd3efd855e359813e2ceaa04168da37e82d Mon Sep 17 00:00:00 2001 From: "Paul \"TBBle\" Hampson" Date: Sat, 25 Jan 2020 21:28:14 +1100 Subject: [PATCH] Revert "hack: remove support for containerd 1.2" This reverts commit c4f03056c93c12a6efcbff0f59e48297122b2b56. containerd 1.2 is still supported, per discussion at https://github.com/moby/buildkit/pull/1314#discussion_r364477958 Signed-off-by: Paul "TBBle" Hampson --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8e2d0a09f674..4d9cd0a7eb82 100644 --- a/Dockerfile +++ b/Dockerfile @@ -219,7 +219,7 @@ RUN apt-get install -y --no-install-recommends uidmap sudo vim iptables \ && chown -R user /run/user/1000 /home/user \ && update-alternatives --set iptables /usr/sbin/iptables-legacy # musl is needed to directly use the registry binary that is built on alpine -#ENV BUILDKIT_INTEGRATION_CONTAINERD_EXTRA="containerd-1.2=/opt/containerd-old/bin" +ENV BUILDKIT_INTEGRATION_CONTAINERD_EXTRA="containerd-1.2=/opt/containerd-old/bin" COPY --from=rootlesskit /rootlesskit /usr/bin/ COPY --from=containerd-old /out/containerd* /opt/containerd-old/bin/ COPY --from=registry /bin/registry /usr/bin