Merge pull request #2854 from giuseppe/rootless-isolation-default

pkg, cli: rootless uses correct isolation
containers · Dec 15, 2020 · d69f76a · d69f76a
2 parents 5b867f2 + 6eb5801
commit d69f76a
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/pkg/cli/common.go b/pkg/cli/common.go
@@ -17,6 +17,7 @@ import (
 	"github.com/containers/common/pkg/auth"
 	commonComp "github.com/containers/common/pkg/completion"
 	"github.com/containers/common/pkg/config"
+	"github.com/containers/storage/pkg/unshare"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
 	"github.com/spf13/pflag"
@@ -366,6 +367,9 @@ func DefaultIsolation() string {
 	if isolation != "" {
 		return isolation
 	}
+	if unshare.IsRootless() {
+		return "rootless"
+	}
 	return buildah.OCI
 }