Skip to content

[master] deb, rpm: remove libseccomp-dev, libseccomp2, libselinux-devel, selinux-policy-devel, aufs-tools dependenciies #1124

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

Merged
thaJeztah merged 5 commits into from
Dec 12, 2024
Merged

[master] deb, rpm: remove libseccomp-dev, libseccomp2, libselinux-devel, selinux-policy-devel, aufs-tools dependenciies #1124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fbdeaf5
deb, rpm: remove libseccomp-dev, libseccomp2 dependencies
thaJeztah Dec 11, 2024
fee28de
rpm: remove libselinux-devel dependency
thaJeztah Dec 11, 2024
c684248
rpm: remove selinux-policy-devel
thaJeztah Dec 11, 2024
85327c1
rpm: remove version-constraint for container-selinux
thaJeztah Dec 11, 2024
ffad939
deb: remove aufs-tools
thaJeztah Dec 11, 2024
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
5 changes: 1 addition & 4 deletions deb/common/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ Build-Depends: bash,
git,
libc-dev,
libltdl-dev,
libseccomp-dev,
libseccomp2,
libsystemd-dev,
libtool,
make,
Expand All @@ -28,7 +26,6 @@ Architecture: linux-any
Depends: containerd.io (>= 1.6.24),
docker-ce-cli,
iptables,
libseccomp2 (>= 2.3.0),
${shlibs:Depends}
Recommends: apparmor,
ca-certificates,
Expand All @@ -39,7 +36,7 @@ Recommends: apparmor,
pigz,
procps,
xz-utils
Suggests: aufs-tools [amd64], cgroupfs-mount | cgroup-lite
Copy link
Member Author

@thaJeztah thaJeztah Dec 12, 2024

Choose a reason for hiding this comment

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

Double checked if it wasn't there for some other obscure purpose, but this was originally added as part of;

Copy link
Member Author

@thaJeztah thaJeztah Dec 12, 2024

Choose a reason for hiding this comment

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

☝️ looks like there's potentially some other bits left behind in moby related to AuFS; I see auplink in there, and it looks like we still account for that in our AppArmor template; https://github.com/moby/moby/blob/7faa4ecfbfe5f641578931ff120c6e0f8faae16a/contrib/apparmor/template.go#L118-L136

Suggests: cgroupfs-mount | cgroup-lite
Conflicts: docker (<< 1.5~),
docker-engine,
docker.io
Expand Down
6 changes: 1 addition & 5 deletions rpm/SPECS/docker-ce.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ Requires: /usr/sbin/groupadd
Recommends: kmod
Requires: docker-ce-cli
Recommends: docker-ce-rootless-extras
Requires: container-selinux >= 2:2.74
Requires: libseccomp >= 2.3
Requires: container-selinux
Requires: systemd
Requires: iptables
%if %{undefined rhel} || 0%{?rhel} < 9
Expand All @@ -36,14 +35,11 @@ BuildRequires: gcc
BuildRequires: git
BuildRequires: glibc-static
BuildRequires: libarchive
BuildRequires: libseccomp-devel
BuildRequires: libselinux-devel
BuildRequires: libtool
BuildRequires: libtool-ltdl-devel
BuildRequires: make
BuildRequires: pkgconfig
BuildRequires: pkgconfig(systemd)
BuildRequires: selinux-policy-devel
BuildRequires: systemd-devel
BuildRequires: tar
BuildRequires: which
Expand Down
Loading