Skip to content
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.

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

Also load ip6_tables when trying to load ip_tables #501

Merged
merged 1 commit into from
Jun 20, 2024

Conversation

tianon
Copy link
Member

@tianon tianon commented Jun 19, 2024

This isn't used/necessary in the default configuration until Docker 27+, but it was optional behavior before that, so it's prudent for us to also try loading it any time we know we're not using nftables / have explicitly requested "legacy" iptables.

See also:

cc/fyi @robmry @akerouanton ❤️

This isn't used/necessary in the default configuration until Docker 27+, but it was optional behavior before that, so it's prudent for us to also try loading it any time we know we're not using nftables / have explicitly requested "legacy" `iptables`.
@tianon
Copy link
Member Author

tianon commented Jun 19, 2024

I thought we'd already been doing this, but apparently I was misremembering, probably because we do check the /proc/net/ip6_tables_names file for clues to whether we should be using legacy xtables. 😅

Copy link

@whalelines whalelines left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@akerouanton akerouanton left a comment

Choose a reason for hiding this comment

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

LGTM

@yosifkit yosifkit merged commit 5753ec0 into docker-library:master Jun 20, 2024
14 checks passed
@yosifkit yosifkit deleted the ip6tables branch June 20, 2024 22:04
docker-library-bot added a commit to docker-library-bot/official-images that referenced this pull request Jun 20, 2024
Changes:

- docker-library/docker@7576de6: Update 27-rc to 27.0.1-rc.1
- docker-library/docker@5753ec0: Merge pull request docker-library/docker#501 from infosiftr/ip6tables
- docker-library/docker@255b5d8: Update 27-rc to compose 2.27.2
- docker-library/docker@879ff34: Update 26 to compose 2.27.2
- docker-library/docker@b3aedde: Update 25 to compose 2.27.2
- docker-library/docker@79288b2: Update 24 to compose 2.27.2
- docker-library/docker@12a00d7: Also load `ip6_tables` when trying to load `ip_tables`
- docker-library/docker@b9cd989: Update 27-rc to buildx 0.15.1
- docker-library/docker@e010b57: Update 26 to buildx 0.15.1
- docker-library/docker@670d387: Update 25 to buildx 0.15.1
- docker-library/docker@e32a14a: Update 24 to buildx 0.15.1
docker-library-bot added a commit to docker-library-bot/official-images that referenced this pull request Jun 21, 2024
Changes:

- docker-library/docker@c4710de: Update 27-rc to compose 2.28.0
- docker-library/docker@d83adb6: Update 26 to compose 2.28.0
- docker-library/docker@14d04d4: Update 25 to compose 2.28.0
- docker-library/docker@81526b8: Update 24 to compose 2.28.0
- docker-library/docker@7576de6: Update 27-rc to 27.0.1-rc.1
- docker-library/docker@5753ec0: Merge pull request docker-library/docker#501 from infosiftr/ip6tables
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants