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

[master] rpm: remove CentOS/RHEL 7 leftovers #1040

Merged
merged 2 commits into from
Jul 24, 2024
Merged

[master] rpm: remove CentOS/RHEL 7 leftovers #1040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9856899
rpm: remove conditional weak-dependencies for CentOS/RHEL 7
thaJeztah Jul 20, 2024
57e2252
rpm: remove RLIMIT_NOFILE patch for EL 7 systems
thaJeztah Jul 20, 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: 0 additions & 5 deletions rpm/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,6 @@ $(DISTROS): sources

.PHONY: sources
sources: rpmbuild/SOURCES/engine.tgz rpmbuild/SOURCES/cli.tgz rpmbuild/SOURCES/buildx.tgz rpmbuild/SOURCES/compose.tgz
sources: rpmbuild/SOURCES/01-rlimit_nofile-rhel7.patch

rpmbuild/SOURCES/%.patch:
mkdir -p $(@D)
cp $(CURDIR)/patches/$(@F) $@

rpmbuild/SOURCES/engine.tgz:
mkdir -p $(@D)
Expand Down
9 changes: 0 additions & 9 deletions rpm/SPECS/docker-ce-cli.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,8 @@ Packager: Docker <support@docker.com>
Requires: /bin/sh
Requires: /usr/sbin/groupadd

# CentOS 7 and RHEL 7 do not yet support weak dependencies
#
# Note that we're not using <= 7 here, to account for other RPM distros, such
# as Fedora, which would not have the rhel macro set (so default to 0).
%if 0%{?rhel} == 7
Requires: docker-buildx-plugin
Requires: docker-compose-plugin
%else
Recommends: docker-buildx-plugin
Recommends: docker-compose-plugin
%endif

BuildRequires: make
BuildRequires: libtool-ltdl-devel
Expand Down
12 changes: 0 additions & 12 deletions rpm/SPECS/docker-ce.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ Version: %{_version}
Release: %{_release}%{?dist}
Epoch: 3
Source0: engine.tgz
Patch0: 01-rlimit_nofile-rhel7.patch
Summary: The open-source application container engine
Group: Tools/Docker
License: ASL 2.0
Expand All @@ -15,15 +14,7 @@ Packager: Docker <support@docker.com>

Requires: /usr/sbin/groupadd
Requires: docker-ce-cli
# CentOS 7 and RHEL 7 do not yet support weak dependencies
#
# Note that we're not using <= 7 here, to account for other RPM distros, such
# as Fedora, which would not have the rhel macro set (so default to 0).
%if 0%{?rhel} == 7
Requires: docker-ce-rootless-extras
%else
Recommends: docker-ce-rootless-extras
%endif
Requires: container-selinux >= 2:2.74
Requires: libseccomp >= 2.3
Requires: systemd
Expand Down Expand Up @@ -78,9 +69,6 @@ depending on a particular stack or provider.

%prep
%setup -q -c -n src -a 0
%if 0%{?rhel} == 7
%patch -p1 -P 0
%endif

%build

Expand Down
6 changes: 0 additions & 6 deletions rpm/SPECS/docker-compose-plugin.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,7 @@ URL: https://github.com/docker/compose/
Vendor: Docker
Packager: Docker <support@docker.com>

# CentOS 7 and RHEL 7 do not yet support weak dependencies.
#
# Note that we're not using <= 7 here, to account for other RPM distros, such
# as Fedora, which would not have the rhel macro set (so default to 0).
%if 0%{?rhel} != 7
Enhances: docker-ce-cli
%endif

BuildRequires: bash

Expand Down
15 changes: 0 additions & 15 deletions rpm/patches/01-rlimit_nofile-rhel7.patch
View file
Open in desktop

This file was deleted.

Loading