diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index cfa144a7e..278bb6251 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -23,14 +23,6 @@ RUN for repopkgs in /tmp/packages.repo.*; do \ 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 -# 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 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, # while go1.16 defaults to using it, so must disable with GO111MODULE=off 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 && \ cd $GOPATH/src/github.com/containerd && \ git clone https://github.com/containerd/containerd.git && \