Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docker-engine: remove devicemapper dependencies #172

Merged
merged 1 commit into from
Oct 21, 2023
Merged

docker-engine: remove devicemapper dependencies #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/docker-engine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

interesting actually that we had to manually install these; didn't we let the rpm/deb tools handle install dependencies?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This stage is to build static binaries like docker/docker-ce-packaging#835

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the future if I can rely on upstream Dockerfiles I could just use the right remote target and avoid redefining this stage.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh! Yes for the static binaries it makes sense

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 \
Expand Down
1 change: 0 additions & 1 deletion pkg/docker-engine/deb/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ Build-Depends: ca-certificates,
debhelper-compat (= 12),
gcc,
libc-dev,
libdevmapper-dev,
libltdl-dev,
libseccomp-dev,
libseccomp2,
Expand Down
1 change: 0 additions & 1 deletion pkg/docker-engine/rpm/docker-ce.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ Requires: xz
BuildRequires: bash
BuildRequires: ca-certificates
BuildRequires: cmake
BuildRequires: device-mapper-devel
BuildRequires: gcc
BuildRequires: glibc-static
BuildRequires: libarchive
Expand Down
1 change: 0 additions & 1 deletion pkg/docker-engine/verify.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down