Skip to content

Commit 6cf2dbd

Browse files
Merge pull request #17026 from ashcrow/docker-excluder
Automatic merge from submit-queue (batch tested with PRs 17020, 17026, 17000, 17010). rpm: Remove 1.13 from excluder The oldest docker version available in Fedora 26 is 1.13. Fixes: openshift/openshift-ansible#5833
2 parents e0032c4 + d74d913 commit 6cf2dbd

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

origin.spec

+1-1
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ chmod 0744 $RPM_BUILD_ROOT/usr/sbin/%{name}-excluder
403403

404404
# Install docker-excluder script
405405
sed "s|@@CONF_FILE-VARIABLE@@|${OS_CONF_FILE}|" contrib/excluder/excluder-template > $RPM_BUILD_ROOT/usr/sbin/%{name}-docker-excluder
406-
sed -i "s|@@PACKAGE_LIST-VARIABLE@@|docker*1.13* docker*1.14* docker*1.15* docker*1.16* docker*1.17* docker*1.18* docker*1.19* docker*1.20*|" $RPM_BUILD_ROOT/usr/sbin/%{name}-docker-excluder
406+
sed -i "s|@@PACKAGE_LIST-VARIABLE@@|docker*1.14* docker*1.15* docker*1.16* docker*1.17* docker*1.18* docker*1.19* docker*1.20*|" $RPM_BUILD_ROOT/usr/sbin/%{name}-docker-excluder
407407
chmod 0744 $RPM_BUILD_ROOT/usr/sbin/%{name}-docker-excluder
408408

409409
# Install migration scripts

0 commit comments

Comments
 (0)