Skip to content

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

Open
vvoland wants to merge 2 commits into
docker:mainfrom
vvoland:sync-dockerce
Open

vvoland wants to merge 2 commits into
docker:mainfrom
vvoland:sync-dockerce

Conversation

@vvoland

@vvoland vvoland commented Nov 6, 2026

Copy link
Copy Markdown
Collaborator

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

The docker-ce rpm required plain iptables, while previous releases built with docker-ce-packaging required (iptables-nft or iptables), which makes dnf pick the nft backend when iptables is not installed.

Restore the rich dependency.

pkg/docker: Restore the runc tag in static runc version output

In the static archives, runc --version reported "commit: 29dd3dc" instead of "commit: v1.5.2-0-g29dd3dc" as in earlier releases. runc derives the commit from git describe, and the shallow fetch of the ref did not fetch the tag.

Also fetch the tag when the ref is one. The fetch fails harmlessly for branches and commits, which keep the previous behavior.

The docker-ce rpm required plain iptables, while previous releases built
with docker-ce-packaging required (iptables-nft or iptables), which
makes dnf pick the nft backend when iptables is not installed.

Restore the rich dependency.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
In the static archives, runc --version reported "commit: 29dd3dc"
instead of "commit: v1.5.2-0-g29dd3dc" as in earlier releases. runc
derives the commit from git describe, and the shallow fetch of the ref
did not fetch the tag.

Also fetch the tag when the ref is one.
The fetch fails harmlessly for branches and commits, which keep the
previous behavior.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>

@thaJeztah thaJeztah left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM (for rc2)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants