summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2020-04-22 09:44:42 -0400
committerGitHub <noreply@github.com>2020-04-22 09:44:42 -0400
commit0d57ea420e88bb5c0f1201fc389825df2c6fa0af (patch)
tree300884138e6575a0a6b7e8a00359a09722a3c057 /vendor
parent5bbbc9996f215536afee530ddd7f176d2c53c869 (diff)
parent4494ec6f04eefd70b7b74aa8f884719e5a5f0467 (diff)
downloadpodman-0d57ea420e88bb5c0f1201fc389825df2c6fa0af.tar.gz
podman-0d57ea420e88bb5c0f1201fc389825df2c6fa0af.tar.bz2
podman-0d57ea420e88bb5c0f1201fc389825df2c6fa0af.zip
Merge pull request #5934 from rhatdan/v2
vendor in containers/common v0.9.4
Diffstat (limited to 'vendor')
-rw-r--r--vendor/github.com/containers/common/pkg/config/default.go2
-rw-r--r--vendor/modules.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/vendor/github.com/containers/common/pkg/config/default.go b/vendor/github.com/containers/common/pkg/config/default.go
index 8b87d3725..d0f8649c5 100644
--- a/vendor/github.com/containers/common/pkg/config/default.go
+++ b/vendor/github.com/containers/common/pkg/config/default.go
@@ -173,7 +173,7 @@ func DefaultConfig() (*Config, error) {
SeccompProfile: SeccompDefaultPath,
ShmSize: DefaultShmSize,
UTSNS: "private",
- UserNS: "private",
+ UserNS: "host",
UserNSSize: DefaultUserNSSize,
},
Network: NetworkConfig{
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 428812cc6..ba7990fb7 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -82,7 +82,7 @@ github.com/containers/buildah/pkg/secrets
github.com/containers/buildah/pkg/supplemented
github.com/containers/buildah/pkg/umask
github.com/containers/buildah/util
-# github.com/containers/common v0.9.2
+# github.com/containers/common v0.9.4
github.com/containers/common/pkg/apparmor
github.com/containers/common/pkg/auth
github.com/containers/common/pkg/capabilities