Skip to content

Commit

Permalink
hack: remove support for containerd 1.2
Browse files Browse the repository at this point in the history
Signed-off-by: Tonis Tiigi <[email protected]>
  • Loading branch information
tonistiigi committed Oct 16, 2019
1 parent bbc8b6d commit c4f0305
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion hack/dockerfiles/test.buildkit.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c4f0305

Please sign in to comment.