mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
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 <jhuntwork@lightcubesolutions.com>
This commit is contained in:
parent
bc6f4cc703
commit
1600e851b5
1 changed files with 6 additions and 4 deletions
10
Dockerfile
10
Dockerfile
|
@ -119,6 +119,7 @@ FROM cross-${CROSS} as dev-base
|
||||||
|
|
||||||
FROM dev-base AS runtime-dev-cross-false
|
FROM dev-base AS runtime-dev-cross-false
|
||||||
ARG DEBIAN_FRONTEND
|
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 \
|
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 \
|
--mount=type=cache,sharing=locked,id=moby-cross-false-aptcache,target=/var/cache/apt \
|
||||||
apt-get update && apt-get install -y --no-install-recommends \
|
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 \
|
libapparmor-dev \
|
||||||
libbtrfs-dev \
|
libbtrfs-dev \
|
||||||
libdevmapper-dev \
|
libdevmapper-dev \
|
||||||
libseccomp-dev \
|
libseccomp-dev/buster-backports \
|
||||||
libsystemd-dev \
|
libsystemd-dev \
|
||||||
libudev-dev
|
libudev-dev
|
||||||
|
|
||||||
|
@ -137,15 +138,16 @@ ARG DEBIAN_FRONTEND
|
||||||
# on non-amd64 systems.
|
# on non-amd64 systems.
|
||||||
# Additionally, the crossbuild-amd64 is currently only on debian:buster, so
|
# Additionally, the crossbuild-amd64 is currently only on debian:buster, so
|
||||||
# other architectures cannnot crossbuild amd64.
|
# 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 \
|
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 \
|
--mount=type=cache,sharing=locked,id=moby-cross-true-aptcache,target=/var/cache/apt \
|
||||||
apt-get update && apt-get install -y --no-install-recommends \
|
apt-get update && apt-get install -y --no-install-recommends \
|
||||||
libapparmor-dev:arm64 \
|
libapparmor-dev:arm64 \
|
||||||
libapparmor-dev:armel \
|
libapparmor-dev:armel \
|
||||||
libapparmor-dev:armhf \
|
libapparmor-dev:armhf \
|
||||||
libseccomp-dev:arm64 \
|
libseccomp-dev:arm64/buster-backports \
|
||||||
libseccomp-dev:armel \
|
libseccomp-dev:armel/buster-backports \
|
||||||
libseccomp-dev:armhf
|
libseccomp-dev:armhf/buster-backports
|
||||||
|
|
||||||
FROM runtime-dev-cross-${CROSS} AS runtime-dev
|
FROM runtime-dev-cross-${CROSS} AS runtime-dev
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue