summaryrefslogtreecommitdiff
path: root/vendor/github.com/projectatomic/buildah/pkg
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2018-08-14 12:06:09 +0200
committerAtomic Bot <atomic-devel@projectatomic.io>2018-08-15 11:40:30 +0000
commite2b96e96f93d1da17b817eaa960b9d809bc61a14 (patch)
tree9dbf734f5f2021889666da7a738792635f2bf520 /vendor/github.com/projectatomic/buildah/pkg
parentcd7102a70e7f3555df832c4c1bcf958e121cbf4d (diff)
downloadpodman-e2b96e96f93d1da17b817eaa960b9d809bc61a14.tar.gz
podman-e2b96e96f93d1da17b817eaa960b9d809bc61a14.tar.bz2
podman-e2b96e96f93d1da17b817eaa960b9d809bc61a14.zip
vendor: update buildah version
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> Closes: #1269 Approved by: rhatdan
Diffstat (limited to 'vendor/github.com/projectatomic/buildah/pkg')
-rw-r--r--vendor/github.com/projectatomic/buildah/pkg/parse/parse.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/vendor/github.com/projectatomic/buildah/pkg/parse/parse.go b/vendor/github.com/projectatomic/buildah/pkg/parse/parse.go
index bd333a2cc..2dff18818 100644
--- a/vendor/github.com/projectatomic/buildah/pkg/parse/parse.go
+++ b/vendor/github.com/projectatomic/buildah/pkg/parse/parse.go
@@ -545,6 +545,8 @@ func defaultIsolation() (buildah.Isolation, error) {
if isSet {
if strings.HasPrefix(strings.ToLower(isolation), "oci") {
return buildah.IsolationOCI, nil
+ } else if strings.HasPrefix(strings.ToLower(isolation), "rootless") {
+ return buildah.IsolationOCIRootless, nil
} else if strings.HasPrefix(strings.ToLower(isolation), "chroot") {
return buildah.IsolationChroot, nil
}
@@ -558,6 +560,8 @@ func IsolationOption(c *cli.Context) (buildah.Isolation, error) {
if c.String("isolation") != "" {
if strings.HasPrefix(strings.ToLower(c.String("isolation")), "oci") {
return buildah.IsolationOCI, nil
+ } else if strings.HasPrefix(strings.ToLower(c.String("isolation")), "rootless") {
+ return buildah.IsolationOCIRootless, nil
} else if strings.HasPrefix(strings.ToLower(c.String("isolation")), "chroot") {
return buildah.IsolationChroot, nil
} else {