From c6e5ff83e0afc14a3cce9e918bcb32290e8043d9 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Fri, 19 May 2017 11:32:37 +0100 Subject: [PATCH] Update containerd - use new Makefile flags to add our build flags correctly now - restore `dist` for now as it is useful for testing still, for now Will remove both `dist` and `ctr` once we have our own tool, but will add them to dev container instead. Signed-off-by: Justin Cormack --- pkg/containerd/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index c3a430e4a..ea5e16d24 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -10,13 +10,13 @@ RUN \ make \ && true ENV GOPATH=/root/go -ENV CONTAINERD_COMMIT=b53105ed253b99f8b63809e704f23819dce9776e +ENV CONTAINERD_COMMIT=0f0f3b69dcba2efeba012ff55e2a596f12cf0bac RUN mkdir -p $GOPATH/src/github.com/containerd && \ cd $GOPATH/src/github.com/containerd && \ 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\"'" +RUN make binaries EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS="-extldflags \\\"-fno-PIC -static\\\"" RUN cp bin/containerd bin/ctr bin/containerd-shim bin/dist /usr/bin/ WORKDIR / COPY . . @@ -24,5 +24,5 @@ COPY . . FROM scratch ENTRYPOINT [] WORKDIR / -COPY --from=alpine /usr/bin/containerd /usr/bin/ctr /usr/bin/containerd-shim /usr/bin/ +COPY --from=alpine /usr/bin/containerd /usr/bin/ctr /usr/bin/dist /usr/bin/containerd-shim /usr/bin/ COPY --from=alpine /etc/containerd/config.toml /etc/containerd/