Skip to content

[28.x backport] cli/command: remove AddTrustSigningFlags, AddTrustVerificationFlags, AddPlatformFlag utilities #6311

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.

Sign up for GitHub

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

Merged
thaJeztah merged 4 commits into from
Aug 20, 2025
Merged

[28.x backport] cli/command: remove AddTrustSigningFlags, AddTrustVerificationFlags, AddPlatformFlag utilities #6311

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
53ed958
cli/command: remove AddTrustSigningFlags
thaJeztah Aug 6, 2025
7126bf7
[28.x] remove some uses of AddTrustVerificationFlags
thaJeztah Aug 19, 2025
4e00c31
cli/command: remove AddTrustVerificationFlags
thaJeztah Aug 6, 2025
8088471
cli/command: remove AddPlatformFlag utility
thaJeztah Aug 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
cli/command: remove AddTrustVerificationFlags 
It was only used internally; inline it where used.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit c0fbbe0)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
  • Loading branch information
@thaJeztah
thaJeztah committed Aug 19, 2025
commit 4e00c31c71cbac90d8746f856cf1a17d24f5ec19
2 changes: 1 addition & 1 deletion cli/command/container/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ func NewCreateCommand(dockerCli command.Cli) *cobra.Command {
flags.Bool("help", false, "Print usage")

command.AddPlatformFlag(flags, &options.platform)
command.AddTrustVerificationFlags(flags, &options.untrusted, dockerCli.ContentTrustEnabled())
flags.BoolVar(&options.untrusted, "disable-content-trust", !dockerCli.ContentTrustEnabled(), "Skip image verification")
copts = addFlags(flags)

addCompletions(cmd, dockerCli)
Expand Down
2 changes: 1 addition & 1 deletion cli/command/container/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ func NewRunCommand(dockerCli command.Cli) *cobra.Command {
flags.Bool("help", false, "Print usage")

command.AddPlatformFlag(flags, &options.platform)
command.AddTrustVerificationFlags(flags, &options.untrusted, dockerCli.ContentTrustEnabled())
flags.BoolVar(&options.untrusted, "disable-content-trust", !dockerCli.ContentTrustEnabled(), "Skip image verification")
copts = addFlags(flags)

_ = cmd.RegisterFlagCompletionFunc("detach-keys", completeDetachKeys)
Expand Down
2 changes: 1 addition & 1 deletion cli/command/image/pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func NewPullCommand(dockerCli command.Cli) *cobra.Command {
flags.BoolVarP(&opts.quiet, "quiet", "q", false, "Suppress verbose output")

command.AddPlatformFlag(flags, &opts.platform)
command.AddTrustVerificationFlags(flags, &opts.untrusted, dockerCli.ContentTrustEnabled())
flags.BoolVar(&opts.untrusted, "disable-content-trust", !dockerCli.ContentTrustEnabled(), "Skip image verification")

_ = cmd.RegisterFlagCompletionFunc("platform", completion.Platforms)

Expand Down
10 changes: 0 additions & 10 deletions cli/command/trust.go
View file
Open in desktop

This file was deleted.