mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-24 03:15:36 +00:00
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 <justin.cormack@docker.com>
This commit is contained in:
parent
ac31862c42
commit
c6e5ff83e0
@ -10,13 +10,13 @@ RUN \
|
|||||||
make \
|
make \
|
||||||
&& true
|
&& true
|
||||||
ENV GOPATH=/root/go
|
ENV GOPATH=/root/go
|
||||||
ENV CONTAINERD_COMMIT=b53105ed253b99f8b63809e704f23819dce9776e
|
ENV CONTAINERD_COMMIT=0f0f3b69dcba2efeba012ff55e2a596f12cf0bac
|
||||||
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 https://github.com/containerd/containerd.git
|
||||||
WORKDIR $GOPATH/src/github.com/containerd/containerd
|
WORKDIR $GOPATH/src/github.com/containerd/containerd
|
||||||
RUN git checkout $CONTAINERD_COMMIT
|
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/
|
RUN cp bin/containerd bin/ctr bin/containerd-shim bin/dist /usr/bin/
|
||||||
WORKDIR /
|
WORKDIR /
|
||||||
COPY . .
|
COPY . .
|
||||||
@ -24,5 +24,5 @@ COPY . .
|
|||||||
FROM scratch
|
FROM scratch
|
||||||
ENTRYPOINT []
|
ENTRYPOINT []
|
||||||
WORKDIR /
|
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/
|
COPY --from=alpine /etc/containerd/config.toml /etc/containerd/
|
||||||
|
Loading…
Reference in New Issue
Block a user