diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-03-28 11:00:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-28 11:00:45 +0000 |
| commit | 7e4b13b94699ee688c146afab727d2dec991376a (patch) | |
| tree | 616ea2812602306c56e1529a1e8578bd168abb51 /pkg | |
| parent | b2e7a3e45c89132e41b0d864dbc4eacacbecf08d (diff) | |
| parent | 6e250c317c9bddafeb9b7c36dbdc9a79a457da32 (diff) | |
| download | podman-7e4b13b94699ee688c146afab727d2dec991376a.tar.gz podman-7e4b13b94699ee688c146afab727d2dec991376a.tar.bz2 podman-7e4b13b94699ee688c146afab727d2dec991376a.zip | |
Merge pull request #9467 from rhatdan/buildah
[NO TESTS NEEDED] Turn on podman-remote build --isolation
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/api/handlers/compat/images_build.go | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go index 0a63d6e1c..15ba5c685 100644 --- a/pkg/api/handlers/compat/images_build.go +++ b/pkg/api/handlers/compat/images_build.go @@ -199,13 +199,9 @@ func BuildImage(w http.ResponseWriter, r *http.Request) { } format := buildah.Dockerv2ImageManifest registry := query.Registry - isolation := buildah.IsolationChroot - /* - // FIXME, This is very broken. Buildah will only work with chroot - isolation := buildah.IsolationDefault - */ + isolation := buildah.IsolationDefault if utils.IsLibpodRequest(r) { - // isolation = parseLibPodIsolation(query.Isolation) + isolation = parseLibPodIsolation(query.Isolation) registry = "" format = query.OutputFormat } else { |