github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-22 02:21:34 +00:00
Code Issues Projects Releases Wiki Activity

Define CONTAINERD_REPO alongside CONTAINERD_COMMIT in tools/alpine

Browse Source 
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 <ijc@docker.com>
This commit is contained in:
Ian Campbell 2017-07-12 15:51:23 +01:00
parent 0c6af4b3be
commit c5634c4650
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/containerd/Dockerfile
View File

@ -11,11 +11,11 @@ RUN \
tzdata \ tzdata \
&& true && true
ENV GOPATH=/go PATH=$PATH:/go/bin 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 && \ RUN mkdir -p $GOPATH/src/github.com/containerd && \
cd $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 WORKDIR $GOPATH/src/github.com/containerd/containerd
# CONTAINERD_COMMIT is defined in linuxkit/alpine
RUN git checkout $CONTAINERD_COMMIT RUN git checkout $CONTAINERD_COMMIT
RUN make binaries EXTRA_FLAGS="-buildmode pie" EXTRA_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/ RUN cp bin/containerd bin/ctr bin/containerd-shim bin/dist /usr/bin/

1
tools/alpine/Dockerfile
View File

@ -49,4 +49,5 @@ COPY --from=mirror /Dockerfile /Dockerfile
RUN apk update && apk upgrade -a RUN apk update && apk upgrade -a
ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git
ENV CONTAINERD_COMMIT=v1.0.0-alpha0 ENV CONTAINERD_COMMIT=v1.0.0-alpha0