Skip to content

Commit

Permalink
rpm: remove RLIMIT_NOFILE patch for EL 7 systems
Browse files Browse the repository at this point in the history
Now that CentOS/RHEL 7 and 8 reached EOL and removed from our packaging
(in 88a6cdc, 67c89e9),
we can remove the patch.

> RLIMIT_NOFILE defaults to an unusable value on EL 7 systems, but more
> modern systems have sane defaults. As such, patch the systemd unit only
> on EL 7 systems to ensure correct behaviour.

This reverts commit 4e7a147.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
  • Loading branch information
thaJeztah committed Jul 20, 2024
1 parent cf0bdaf commit df15be2
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 24 deletions.
5 changes: 0 additions & 5 deletions rpm/Makefile
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
4 changes: 0 additions & 4 deletions rpm/SPECS/docker-ce.spec
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 Down Expand Up @@ -70,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
15 changes: 0 additions & 15 deletions rpm/patches/01-rlimit_nofile-rhel7.patch

This file was deleted.

0 comments on commit df15be2

Please sign in to comment.