info: skip client-side warning about seccomp profile on API >= 1.42 #3230
Conversation
This file contains 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
silvin-lubecki
approved these changes
Aug 3, 2021
cpuguy83
requested changes
Aug 3, 2021
thaJeztah
changed the title
thaJeztah
force-pushed
the
remove_seccomp_warning
branch
from
3221543 to
d494d4c
Compare
This warning will be moved to the daemon-side, similar to how it returns other warnings. There's work in progress to change the name of the default profile, so we may need to backport this change to prevent existing clients from printing an incorrect warning if they're connecting to a newer daemon. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
force-pushed
the
remove_seccomp_warning
branch
from
d494d4c to
8964595
Compare
Codecov Report
@@ Coverage Diff @@
## master #3230 +/- ##
==========================================
+ Coverage 58.00% 58.01% +0.01%
==========================================
Files 302 302
Lines 21743 21753 +10
==========================================
+ Hits 12613 12621 +8
- Misses 8207 8208 +1
- Partials 923 924 +1 |
thaJeztah
commented
Aug 4, 2021
| @@ -254,9 +255,6 @@ func prettyPrintServerInfo(dockerCli command.Cli, info types.Info) []error { | |||
| for _, o := range so.Options { | |||
| switch o.Key { | |||
| case "profile": | |||
| if o.Value != "default" { | |||
There was a problem hiding this comment.
@cpuguy83 updated; PTAL
Alternatively, I could do:
Suggested change
| if o.Value != "default" { | |
| if o.Value != "default" && o.Value != "builtin" && versions.LessThan(dockerCli.Client().ClientVersion(), "1.42") { |
Which would bring a smaller patch, but I tried to also group the warning with the other warnings (printed at the end) instead of having it "half-way" the docker info output here. Happy to change though if you think that's an issue.
|
ping @cpuguy83 PTAL 🤗 |
1 task
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
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.
This warning will be moved to the daemon-side, similar to how it returns
other warnings. There's work in progress to change the name of the default
profile, so we may need to backport this change to prevent existing clients
from printing an incorrect warning if they're connecting to a newer daemon.
relates to moby/moby#42481
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)