diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-01-24 16:26:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-24 16:26:44 -0500 |
| commit | 6d8507d06bd8f1dbe91a688393e6fbd2b3382f23 (patch) | |
| tree | 3b21d461a2e65a11981edbc460ec4053c55fa773 /cmd/podman | |
| parent | be722e59eca6cf4b8f9249825e044930d6534f74 (diff) | |
| parent | dbfe79757b33231b3e5dc8537deb85fba8402eef (diff) | |
| download | podman-6d8507d06bd8f1dbe91a688393e6fbd2b3382f23.tar.gz podman-6d8507d06bd8f1dbe91a688393e6fbd2b3382f23.tar.bz2 podman-6d8507d06bd8f1dbe91a688393e6fbd2b3382f23.zip | |
Merge pull request #12996 from Luap99/buildah-rootless
remote build: set rootless oci isolation correctly
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/images/build.go | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go index f975cd6d5..cde050d5e 100644 --- a/cmd/podman/images/build.go +++ b/cmd/podman/images/build.go @@ -183,12 +183,6 @@ func buildFlags(cmd *cobra.Command) { completion.CompleteCommandFlags(cmd, fromAndBudFlagsCompletions) flags.SetNormalizeFunc(buildahCLI.AliasFlags) if registry.IsRemote() { - flag = flags.Lookup("isolation") - buildOpts.Isolation = buildahDefine.OCI - if err := flag.Value.Set(buildahDefine.OCI); err != nil { - logrus.Errorf("Unable to set --isolation to %v: %v", buildahDefine.OCI, err) - } - flag.DefValue = buildahDefine.OCI _ = flags.MarkHidden("disable-content-trust") _ = flags.MarkHidden("cache-from") _ = flags.MarkHidden("sign-by") |