github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-11-04 10:06:20 +00:00
Code Issues Projects Releases Wiki Activity

alpine: Bump containerd to v1.3.3

Browse Source 
Note this release has the workaround for the disabling tests.

Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
This commit is contained in:
Rolf Neugebauer
2020-04-12 12:47:35 +01:00
parent 2320529f3d
commit 2ad6a61079
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/alpine/Dockerfile
View File

@@ -56,15 +56,12 @@ RUN go get -u github.com/LK4D4/vndr
# `test/pkg/containerd/Dockerfile` when changing this. # `test/pkg/containerd/Dockerfile` when changing this.
# For v1.3.x cherry-pick a upstream commit to allow disabling some tests. # For v1.3.x cherry-pick a upstream commit to allow disabling some tests.
ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git
ENV CONTAINERD_COMMIT=v1.3.2 ENV CONTAINERD_COMMIT=v1.3.3
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 && \
cd $GOPATH/src/github.com/containerd/containerd && \ cd $GOPATH/src/github.com/containerd/containerd && \
git checkout $CONTAINERD_COMMIT && \ git checkout $CONTAINERD_COMMIT
git config --global user.email "you@example.com" && \
git config --global user.name "Your Name" && \
git cherry-pick 94d499843c0202af9636cad522d30eaf9ffed798
RUN apk add --no-cache btrfs-progs-dev gcc libc-dev linux-headers make libseccomp-dev RUN apk add --no-cache btrfs-progs-dev gcc libc-dev linux-headers make libseccomp-dev
RUN cd $GOPATH/src/github.com/containerd/containerd && \ RUN cd $GOPATH/src/github.com/containerd/containerd && \
make binaries EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS='-extldflags "-fno-PIC -static"' BUILDTAGS="static_build no_devmapper" make binaries EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS='-extldflags "-fno-PIC -static"' BUILDTAGS="static_build no_devmapper"