Skip to content

Commit 57e2252

Browse files
committed
rpm: remove RLIMIT_NOFILE patch for EL 7 systems
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]>
1 parent 9856899 commit 57e2252

3 files changed

Lines changed: 0 additions & 24 deletions

File tree

rpm/Makefile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,6 @@ $(DISTROS): sources
9494

9595
.PHONY: sources
9696
sources: rpmbuild/SOURCES/engine.tgz rpmbuild/SOURCES/cli.tgz rpmbuild/SOURCES/buildx.tgz rpmbuild/SOURCES/compose.tgz
97-
sources: rpmbuild/SOURCES/01-rlimit_nofile-rhel7.patch
98-
99-
rpmbuild/SOURCES/%.patch:
100-
mkdir -p $(@D)
101-
cp $(CURDIR)/patches/$(@F) $@
10297

10398
rpmbuild/SOURCES/engine.tgz:
10499
mkdir -p $(@D)

rpm/SPECS/docker-ce.spec

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ Version: %{_version}
55
Release: %{_release}%{?dist}
66
Epoch: 3
77
Source0: engine.tgz
8-
Patch0: 01-rlimit_nofile-rhel7.patch
98
Summary: The open-source application container engine
109
Group: Tools/Docker
1110
License: ASL 2.0
@@ -70,9 +69,6 @@ depending on a particular stack or provider.
7069

7170
%prep
7271
%setup -q -c -n src -a 0
73-
%if 0%{?rhel} == 7
74-
%patch -p1 -P 0
75-
%endif
7672

7773
%build
7874

rpm/patches/01-rlimit_nofile-rhel7.patch

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)