From c5634c4650b77aca39c6eb4f93b1caf7107d4871 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 12 Jul 2017 15:51:23 +0100 Subject: [PATCH] Define CONTAINERD_REPO alongside CONTAINERD_COMMIT in tools/alpine This will make it simpler to temporarily in PRs which are not yet merged (but are expected to be soon). Tools alpine is not rebuilt here since we are going to do just that in the next commit. Signed-off-by: Ian Campbell --- pkg/containerd/Dockerfile | 4 ++-- tools/alpine/Dockerfile | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index 0d50960fd..65ff2a05b 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -11,11 +11,11 @@ RUN \ tzdata \ && true ENV GOPATH=/go PATH=$PATH:/go/bin +# CONTAINERD_REPO and CONTAINERD_COMMIT are defined in linuxkit/alpine RUN mkdir -p $GOPATH/src/github.com/containerd && \ cd $GOPATH/src/github.com/containerd && \ - git clone https://github.com/containerd/containerd.git + git clone $CONTAINERD_REPO WORKDIR $GOPATH/src/github.com/containerd/containerd -# CONTAINERD_COMMIT is defined in linuxkit/alpine RUN git checkout $CONTAINERD_COMMIT 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/ diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index a758a377c..65f207038 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -49,4 +49,5 @@ COPY --from=mirror /Dockerfile /Dockerfile RUN apk update && apk upgrade -a +ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git ENV CONTAINERD_COMMIT=v1.0.0-alpha0