summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2021-03-26 15:47:48 -0400
committerMatthew Heon <mheon@redhat.com>2021-03-29 13:54:14 -0400
commit670e1ac67c3e0afbd583dd7fda5fa94f373c1a86 (patch)
tree225b9b89866543a6965c82b50d903224985ce453 /pkg
parentac4bdd265308f549c4db775c1674077a6c669b30 (diff)
downloadpodman-670e1ac67c3e0afbd583dd7fda5fa94f373c1a86.tar.gz
podman-670e1ac67c3e0afbd583dd7fda5fa94f373c1a86.tar.bz2
podman-670e1ac67c3e0afbd583dd7fda5fa94f373c1a86.zip
[NO TESTS NEEDED] Turn on podman-remote build --isolation
Currently podman only works with --isolation chroot. This PR fixes this by allowing the isolation mode to default to OCI and to also allow users to pass the isolation mode into the containers. The current tests for --isolation should cause this code to be tested. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'pkg')
-rw-r--r--pkg/api/handlers/compat/images_build.go8
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 20331600d..36785a362 100644
--- a/pkg/api/handlers/compat/images_build.go
+++ b/pkg/api/handlers/compat/images_build.go
@@ -201,13 +201,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 {