From c73f9b3e6bc2ed1b1761b44edfeb542e1ece26eb Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Mon, 8 May 2017 21:10:54 +0100 Subject: [PATCH 1/2] 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\"'" From b70ca67931c22882d6512dd5692d1e3625837522 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Mon, 8 May 2017 21:12:12 +0100 Subject: [PATCH 2/2] Remove dist tool from containerd It is 20MB and we don't use it... Signed-off-by: Justin Cormack --- pkg/containerd/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index 3b6bd656f..637b87a1f 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -20,4 +20,4 @@ RUN cp bin/containerd bin/ctr bin/containerd-shim bin/dist /usr/bin/ WORKDIR / COPY . . RUN printf "FROM scratch\nCOPY /usr/bin/* /usr/bin/\nCOPY /etc/containerd/config.toml /etc/containerd/\n" > Dockerfile -CMD ["tar", "cf", "-", "Dockerfile", "usr/bin/containerd", "usr/bin/ctr", "usr/bin/containerd-shim", "usr/bin/dist", "etc/containerd/config.toml"] +CMD ["tar", "cf", "-", "Dockerfile", "usr/bin/containerd", "usr/bin/ctr", "usr/bin/containerd-shim", "etc/containerd/config.toml"]