From 598c612c935533f673296ca9d7254980a6aba699 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Sat, 21 Oct 2023 18:47:55 +0200 Subject: [PATCH] docker-engine: remove devicemapper dependencies Signed-off-by: CrazyMax --- pkg/docker-engine/Dockerfile | 2 +- pkg/docker-engine/deb/control | 1 - pkg/docker-engine/rpm/docker-ce.spec | 1 - pkg/docker-engine/verify.Dockerfile | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pkg/docker-engine/Dockerfile b/pkg/docker-engine/Dockerfile index c7a84208..c04382f2 100644 --- a/pkg/docker-engine/Dockerfile +++ b/pkg/docker-engine/Dockerfile @@ -188,7 +188,7 @@ ARG DOCKER_ENGINE_REF ARG NIGHTLY_BUILD WORKDIR /build ARG TARGETPLATFORM -RUN xx-apt-get install -y gcc libc6-dev libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev libsecret-1-dev libsystemd-dev libudev-dev pkg-config +RUN xx-apt-get install -y gcc libc6-dev libapparmor-dev libltdl-dev libseccomp-dev libsecret-1-dev libsystemd-dev libudev-dev pkg-config RUN --mount=type=bind,source=scripts/pkg-static-build.sh,target=/usr/local/bin/pkg-static-build \ --mount=type=bind,from=common-scripts,source=gen-ver.sh,target=/usr/local/bin/gen-ver \ --mount=type=bind,from=common-scripts,source=fix-cc.sh,target=/usr/local/bin/fix-cc \ diff --git a/pkg/docker-engine/deb/control b/pkg/docker-engine/deb/control index 19a6bcc4..1505fe8c 100644 --- a/pkg/docker-engine/deb/control +++ b/pkg/docker-engine/deb/control @@ -12,7 +12,6 @@ Build-Depends: ca-certificates, debhelper-compat (= 12), gcc, libc-dev, - libdevmapper-dev, libltdl-dev, libseccomp-dev, libseccomp2, diff --git a/pkg/docker-engine/rpm/docker-ce.spec b/pkg/docker-engine/rpm/docker-ce.spec index c10d42aa..5ecd1874 100644 --- a/pkg/docker-engine/rpm/docker-ce.spec +++ b/pkg/docker-engine/rpm/docker-ce.spec @@ -32,7 +32,6 @@ Requires: xz BuildRequires: bash BuildRequires: ca-certificates BuildRequires: cmake -BuildRequires: device-mapper-devel BuildRequires: gcc BuildRequires: glibc-static BuildRequires: libarchive diff --git a/pkg/docker-engine/verify.Dockerfile b/pkg/docker-engine/verify.Dockerfile index 6ec83956..eecc68d2 100644 --- a/pkg/docker-engine/verify.Dockerfile +++ b/pkg/docker-engine/verify.Dockerfile @@ -26,7 +26,6 @@ FROM scratch AS bin-folder FROM scratch AS common-scripts FROM ${PKG_BASE_IMAGE} AS verify-deb -RUN apt-get update && apt-get install -y --no-install-recommends libdevmapper-dev COPY --from=xx / / ARG PKG_DISTRO ARG PKG_DISTRO_ID