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

dockerd: misc maintainence #14816

Merged
merged 6 commits into from
Feb 23, 2021
Merged

Conversation

G-M0N3Y-2503
Copy link
Contributor

Maintainer: @G-M0N3Y-2503
Compile tested: x86_x64, VirtualBox, OpenWrt Master
Run tested: x86_x64, VirtualBox, OpenWrt Master

Description:

  • wan blocking rule now jumps to REJECT instead of DROP to be consistent with other firewall rules
  • Refactored /etc/config/dockerd
    • Default config only sets defaults dictated by OpenWrt, Otherwise, docker defaults can be assumed.
    • Normalized quotation marks
  • Mitigated case where wan blocking rule wasn't added if previous iptables command was taking too long
  • Updated patch file format

Verified

This commit was signed with the committer’s verified signature.
snyk-bot Snyk bot
Signed-off-by: Gerard Ryan <G.M0N3Y.2503@gmail.com>
Signed-off-by: Gerard Ryan <G.M0N3Y.2503@gmail.com>
* Moved logic out of config writing
* Made default config only specify OpenWrt dictated defaults
  Otherwise, docker defaults can be assumed

Signed-off-by: Gerard Ryan <G.M0N3Y.2503@gmail.com>
* Changed from DROP to REJECT to be consistant with other firewall rules

Signed-off-by: Gerard Ryan <G.M0N3Y.2503@gmail.com>
Signed-off-by: Gerard Ryan <G.M0N3Y.2503@gmail.com>
Signed-off-by: Gerard Ryan <G.M0N3Y.2503@gmail.com>
@feckert
Copy link
Member

feckert commented Feb 21, 2021

looks good. We should then also use this in the Openwrt 21.02 branch.

@feckert feckert self-requested a review February 22, 2021 09:03
@G-M0N3Y-2503
Copy link
Contributor Author

looks good. We should then also use this in the Openwrt 21.02 branch.

Agreed.
see #14839

@feckert feckert merged commit f0e9d0f into openwrt:master Feb 23, 2021
@G-M0N3Y-2503 G-M0N3Y-2503 deleted the dockerd-maintainence branch February 23, 2021 10:33
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.

None yet

2 participants