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

Update containerd to 1.4.11

Browse Source 
We can remove the workaround for musl using faccessat(2) and breaking
runc, because the fix is in rc93:

https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.14.0#faccessat2

Signed-off-by: David Scott <dave@recoil.org>
This commit is contained in:
David Scott 2021-10-19 11:47:05 +01:00
parent 2ff94c0d72
commit 34d0aef7d4
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/alpine/Dockerfile
View File

@ -23,14 +23,6 @@ RUN for repopkgs in /tmp/packages.repo.*; do \
apk update --repositories-file=${repofile} --cache-dir ${cachedir} && \ apk update --repositories-file=${repofile} --cache-dir ${cachedir} && \
apk fetch --repositories-file=${repofile} --cache-dir ${cachedir} --recursive -o /mirror/$(apk --print-arch) $(cat ${mergedfile}); done apk fetch --repositories-file=${repofile} --cache-dir ${cachedir} --recursive -o /mirror/$(apk --print-arch) $(cat ${mergedfile}); done
# we CANNOT allow musl-dev or musl > 1.2.2-r0, which ships with alpine:3.13, because 1.2.2-r2, which ships with alpine:edge / alpine:3.14
# uses the new faccessat2 system call which gives errors, see https://wiki.alpinelinux.org/wiki/Draft_Release_Notes_for_Alpine_3.14.0#faccessat2
RUN target="1.2.2-r0" && \
verlte() { [ "$1" = $(printf '%s\n%s' "$1" "$2" | sort -V | head -n1) ] ; } && \
for file in /mirror/$(apk --print-arch)/musl-*.apk; do \
version=$(tar -xf ${file} -O .PKGINFO | awk '$1 == "pkgver" {print $3}') && \
if ! verlte ${version} ${target} ; then echo "removing ${file}" && rm ${file}; fi; done
# install abuild and sudo for signing # install abuild and sudo for signing
RUN apk add --no-cache abuild sudo RUN apk add --no-cache abuild sudo
@ -61,7 +53,7 @@ RUN go get -u github.com/LK4D4/vndr
# when building, note that containerd does not use go modules in the below commit, # when building, note that containerd does not use go modules in the below commit,
# while go1.16 defaults to using it, so must disable with GO111MODULE=off # while go1.16 defaults to using it, so must disable with GO111MODULE=off
ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git
ENV CONTAINERD_COMMIT=v1.4.6 ENV CONTAINERD_COMMIT=v1.4.11
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 && \