Skip to content

Commit

Permalink
Merge pull request #22143 from openshift-cherrypick-robot/cherry-pick…
Browse files Browse the repository at this point in the history
…-22133-to-v5.0

[v5.0] fix remote build isolation on client side
  • Loading branch information
openshift-merge-bot[bot] authored Mar 23, 2024
2 parents 177ea85 + 70fe2a1 commit e852b97
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions cmd/podman/common/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,9 @@ func DefineBuildFlags(cmd *cobra.Command, buildOpts *BuildFlagsWrapper, isFarmBu
completion.CompleteCommandFlags(cmd, fromAndBudFlagsCompletions)
flags.SetNormalizeFunc(buildahCLI.AliasFlags)
if registry.IsRemote() {
// Unset the isolation default as we never want to send this over the API
// as it can be wrong (root vs rootless).
_ = flags.Lookup("isolation").Value.Set("")
_ = flags.MarkHidden("disable-content-trust")
_ = flags.MarkHidden("sign-by")
_ = flags.MarkHidden("signature-policy")
Expand Down

0 comments on commit e852b97

Please sign in to comment.