diff options
| author | Paul Holzinger <pholzing@redhat.com> | 2022-01-24 19:47:28 +0100 |
|---|---|---|
| committer | Paul Holzinger <pholzing@redhat.com> | 2022-01-24 19:51:59 +0100 |
| commit | dbfe79757b33231b3e5dc8537deb85fba8402eef (patch) | |
| tree | b86a955cfeb367eff2c711ddb804dfe3c1fd4d55 /cmd/podman/images/build.go | |
| parent | 54bfabb78a09bc50f270a81756a303e49965f253 (diff) | |
| download | podman-dbfe79757b33231b3e5dc8537deb85fba8402eef.tar.gz podman-dbfe79757b33231b3e5dc8537deb85fba8402eef.tar.bz2 podman-dbfe79757b33231b3e5dc8537deb85fba8402eef.zip | |
remote build: set rootless oci isolation correctly
When we run rootless buildah needs to have IsolationOCIRootless set
otherwise it will run code which cannot be used as rootless user.
Podman should use the buildah default if possible and change it to
rootless mode if needed.
[NO NEW TESTS NEEDED] Should be covered by existing tests once we have
podman-remote rootless tests.
Fixes #12989
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Diffstat (limited to 'cmd/podman/images/build.go')
| -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") |