From 1600e851b5d618fb76ba3aa83b630f3e7c3746c2 Mon Sep 17 00:00:00 2001 From: Jeremy Huntwork Date: Mon, 22 Feb 2021 04:25:43 +0000 Subject: [PATCH] Use buster backports to build with libseccomp-2.4.4 Fixes #41704 The latest released versions of the static binaries (20.10.3) are still unable to use faccessat2 with musl-1.2.2 even though this was addressed in #41353 and related issues. The underlying cause seems to be that the build system here still uses the default version of libseccomp shipped with buster. An updated version is available in buster backports: https://packages.debian.org/buster-backports/libseccomp-dev Signed-off-by: Jeremy Huntwork --- Dockerfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index a75fc2578d..5460ff2c4e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -119,6 +119,7 @@ FROM cross-${CROSS} as dev-base FROM dev-base AS runtime-dev-cross-false ARG DEBIAN_FRONTEND +RUN echo 'deb http://deb.debian.org/debian buster-backports main' > /etc/apt/sources.list.d/backports.list RUN --mount=type=cache,sharing=locked,id=moby-cross-false-aptlib,target=/var/lib/apt \ --mount=type=cache,sharing=locked,id=moby-cross-false-aptcache,target=/var/cache/apt \ apt-get update && apt-get install -y --no-install-recommends \ @@ -127,7 +128,7 @@ RUN --mount=type=cache,sharing=locked,id=moby-cross-false-aptlib,target=/var/lib libapparmor-dev \ libbtrfs-dev \ libdevmapper-dev \ - libseccomp-dev \ + libseccomp-dev/buster-backports \ libsystemd-dev \ libudev-dev @@ -137,15 +138,16 @@ ARG DEBIAN_FRONTEND # on non-amd64 systems. # Additionally, the crossbuild-amd64 is currently only on debian:buster, so # other architectures cannnot crossbuild amd64. +RUN echo 'deb http://deb.debian.org/debian buster-backports main' > /etc/apt/sources.list.d/backports.list RUN --mount=type=cache,sharing=locked,id=moby-cross-true-aptlib,target=/var/lib/apt \ --mount=type=cache,sharing=locked,id=moby-cross-true-aptcache,target=/var/cache/apt \ apt-get update && apt-get install -y --no-install-recommends \ libapparmor-dev:arm64 \ libapparmor-dev:armel \ libapparmor-dev:armhf \ - libseccomp-dev:arm64 \ - libseccomp-dev:armel \ - libseccomp-dev:armhf + libseccomp-dev:arm64/buster-backports \ + libseccomp-dev:armel/buster-backports \ + libseccomp-dev:armhf/buster-backports FROM runtime-dev-cross-${CROSS} AS runtime-dev