Skip to content

pkg/docker-engine/rpm: Prefer iptables-nft again in docker-ce #557

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

Open
vvoland wants to merge 2 commits into
base: main
Choose a base branch
from
Open

pkg/docker-engine/rpm: Prefer iptables-nft again in docker-ce #557

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
fa97c60
pkg/docker-engine/rpm: Prefer iptables-nft again in docker-ce
vvoland Nov 6, 2026
b8e8129
pkg/docker: Restore the runc tag in static runc version output
vvoland Nov 6, 2026
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
2 changes: 1 addition & 1 deletion pkg/docker-engine/rpm/docker-ce.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Requires: docker-ce-cli
Recommends: docker-ce-rootless-extras
Requires: container-selinux
Requires: systemd
Requires: iptables
Requires: (iptables-nft or iptables)
Requires: nftables
%if %{undefined rhel} || 0%{?rhel} < 9
# Libcgroup is no longer available in RHEL/CentOS >= 9 distros.
Expand Down
3 changes: 3 additions & 0 deletions pkg/docker/scripts/pkg-static-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@ fetch_git_ref() {
git -C "$dest" remote add origin "$repo"
git -C "$dest" fetch --depth 1 origin "$ref"
git -C "$dest" checkout -q FETCH_HEAD
# Fetch the tag too, if ref is one, so "git describe" in version strings
# reports it instead of a bare commit.
git -C "$dest" fetch --depth 1 origin "+refs/tags/${ref}:refs/tags/${ref}" || true
}

(
Expand Down
Loading