contrib/apparmor: remove version-dependent rules#8068
Merged
estesp merged 1 commit intocontainerd:mainfrom Feb 13, 2023
Merged
Conversation
This was referenced Feb 8, 2023
neersighted
approved these changes
Feb 8, 2023
AkihiroSuda
approved these changes
Feb 9, 2023
Member
|
Needs rebase on main for Windows CI fixes? |
These conditions were added in docker in moby/moby@8cf8924 to account for old versions of debian/ubuntu (apparmor_parser < 2.8.95) that lacked some options; > This allows us to use the apparmor profile we have in contrib/apparmor/ > and solves the problems where certain functions are not apparent on older > versions of apparmor_parser on debian/ubuntu. Those patches were from 2015/2016, and all currently supported distro versions should now have more current versions than that. Looking at the oldest supported versions; Ubuntu 18.04 "Bionic": apparmor_parser --version AppArmor parser version 2.12 Copyright (C) 1999-2008 Novell Inc. Copyright 2009-2012 Canonical Ltd. Debian 10 "Buster" apparmor_parser --version AppArmor parser version 2.13.2 Copyright (C) 1999-2008 Novell Inc. Copyright 2009-2018 Canonical Ltd. This patch removes the version-dependent rules. Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah
force-pushed
the
apparmor_remove_versioned
branch
from
30c893e to
c990e3f
Compare
Member
Author
|
Ah, thanks for the ping rebased 👍 FWIW; I also have a follow-up to this one in #8069. I decided to keep them separate (the more trivial bits first in this PR). |
1 task
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
These conditions were added in docker in moby/moby@8cf8924 to account for old versions of debian/ubuntu (apparmor_parser < 2.8.95) that lacked some options;
Those patches were from 2015/2016, and all currently supported distro versions should now have more current versions than that. Looking at the oldest supported versions;
Ubuntu 18.04 "Bionic":
Debian 10 "Buster"
This patch removes the version-dependent rules.
Signed-off-by: Sebastiaan van Stijn [email protected]