From c4f03056c93c12a6efcbff0f59e48297122b2b56 Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Thu, 19 Sep 2019 18:37:51 -0700 Subject: [PATCH] hack: remove support for containerd 1.2 Signed-off-by: Tonis Tiigi --- hack/dockerfiles/test.buildkit.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/dockerfiles/test.buildkit.Dockerfile b/hack/dockerfiles/test.buildkit.Dockerfile index 00fd68cfcf07..9b2b938855d7 100644 --- a/hack/dockerfiles/test.buildkit.Dockerfile +++ b/hack/dockerfiles/test.buildkit.Dockerfile @@ -218,7 +218,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