From c73f9b3e6bc2ed1b1761b44edfeb542e1ece26eb Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Mon, 8 May 2017 21:10:54 +0100 Subject: [PATCH] Update containerd My patch has been merged so may as well use upstream. Signed-off-by: Justin Cormack --- pkg/containerd/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index e981da05a..3b6bd656f 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -9,10 +9,10 @@ RUN \ linux-headers \ make \ && true -ENV CONTAINERD_COMMIT=ffe684b017252262431e157741406d4e1fb22831 +ENV CONTAINERD_COMMIT=25a161bf5d4483bd0bea9e38b0e8fe3ecb17b53e RUN mkdir -p $GOPATH/src/github.com/containerd && \ cd $GOPATH/src/github.com/containerd && \ - git clone https://github.com/justincormack/containerd.git + git clone https://github.com/containerd/containerd.git WORKDIR $GOPATH/src/github.com/containerd/containerd RUN git checkout $CONTAINERD_COMMIT RUN make binaries GO_GCFLAGS="-buildmode pie --ldflags '-extldflags \"-fno-PIC -static\"'"