Revert "hack: remove support for containerd 1.2"

This reverts commit c4f0305. containerd 1.2 is still supported, per discussion at #1314 (comment) Signed-off-by: Paul "TBBle" Hampson <[email protected]>
moby · Mar 1, 2020 · bf96afd · bf96afd
1 parent cad9e12
commit bf96afd
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Dockerfile b/Dockerfile
@@ -221,7 +221,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