opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 09:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5934 from rhatdan/v2

Browse Source 
vendor in containers/common v0.9.4
This commit is contained in:
Daniel J Walsh
2020-04-22 09:44:42 -04:00
committed by GitHub
parent 5bbbc9996f 4494ec6f04
commit 0d57ea420e
7 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -10,7 +10,7 @@ require (
github.com/containernetworking/cni v0.7.2-0.20200304161608-4fae32b84921 github.com/containernetworking/cni v0.7.2-0.20200304161608-4fae32b84921
github.com/containernetworking/plugins v0.8.5 github.com/containernetworking/plugins v0.8.5
github.com/containers/buildah v1.14.8 github.com/containers/buildah v1.14.8
github.com/containers/common v0.9.2 github.com/containers/common v0.9.4
github.com/containers/conmon v2.0.14+incompatible github.com/containers/conmon v2.0.14+incompatible
github.com/containers/image/v5 v5.4.3 github.com/containers/image/v5 v5.4.3
github.com/containers/psgo v1.4.0 github.com/containers/psgo v1.4.0

4
go.sum
View File

@ -66,8 +66,8 @@ github.com/containernetworking/plugins v0.8.5/go.mod h1:UZ2539umj8djuRQmBxuazHeJ
github.com/containers/buildah v1.14.8 h1:JbMI0QSOmyZ30Mr2633uCXAj+Fajgh/EFS9xX/Y14oQ= github.com/containers/buildah v1.14.8 h1:JbMI0QSOmyZ30Mr2633uCXAj+Fajgh/EFS9xX/Y14oQ=
github.com/containers/buildah v1.14.8/go.mod h1:ytEjHJQnRXC1ygXMyc0FqYkjcoCydqBQkOdxbH563QU= github.com/containers/buildah v1.14.8/go.mod h1:ytEjHJQnRXC1ygXMyc0FqYkjcoCydqBQkOdxbH563QU=
github.com/containers/common v0.8.1/go.mod h1:VxDJbaA1k6N1TNv9Rt6bQEF4hyKVHNfOfGA5L91ADEs= github.com/containers/common v0.8.1/go.mod h1:VxDJbaA1k6N1TNv9Rt6bQEF4hyKVHNfOfGA5L91ADEs=
github.com/containers/common v0.9.2 h1:TjhjKln4ShCA0a0cflsmUlHm1Bh2+oOZ5JW8pTxe0QM= github.com/containers/common v0.9.4 h1:Rh4vZRT4XJ+lQouE2XpOXr/xV/+wxv4pE7ZmdxmjRt8=
github.com/containers/common v0.9.2/go.mod h1:9YGKPwu6NFYQG2NtSP9bRhNGA8mgd1mUCCkOU2tr+Pc= github.com/containers/common v0.9.4/go.mod h1:9YGKPwu6NFYQG2NtSP9bRhNGA8mgd1mUCCkOU2tr+Pc=
github.com/containers/conmon v2.0.14+incompatible h1:knU1O1QxXy5YxtjMQVKEyCajROaehizK9FHaICl+P5Y= github.com/containers/conmon v2.0.14+incompatible h1:knU1O1QxXy5YxtjMQVKEyCajROaehizK9FHaICl+P5Y=
github.com/containers/conmon v2.0.14+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I= github.com/containers/conmon v2.0.14+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I=
github.com/containers/image/v5 v5.4.3 h1:zn2HR7uu4hpvT5QQHgjqonOzKDuM1I1UHUEmzZT5sbs= github.com/containers/image/v5 v5.4.3 h1:zn2HR7uu4hpvT5QQHgjqonOzKDuM1I1UHUEmzZT5sbs=

1
test/e2e/create_staticip_test.go
View File

@ -19,7 +19,6 @@ var _ = Describe("Podman create with --ip flag", func() {
) )
BeforeEach(func() { BeforeEach(func() {
Skip(v2fail)
SkipIfRootless() SkipIfRootless()
tempdir, err = CreateTempDirInTempDir() tempdir, err = CreateTempDirInTempDir()
if err != nil { if err != nil {

1
test/e2e/run_device_test.go
View File

@ -18,7 +18,6 @@ var _ = Describe("Podman run device", func() {
) )
BeforeEach(func() { BeforeEach(func() {
Skip(v2fail)
tempdir, err = CreateTempDirInTempDir() tempdir, err = CreateTempDirInTempDir()
if err != nil { if err != nil {
os.Exit(1) os.Exit(1)

1
test/e2e/run_selinux_test.go
View File

@ -19,7 +19,6 @@ var _ = Describe("Podman run", func() {
) )
BeforeEach(func() { BeforeEach(func() {
Skip(v2fail)
tempdir, err = CreateTempDirInTempDir() tempdir, err = CreateTempDirInTempDir()
if err != nil { if err != nil {
os.Exit(1) os.Exit(1)

2
vendor/github.com/containers/common/pkg/config/default.go generated vendored
View File

@ -173,7 +173,7 @@ func DefaultConfig() (*Config, error) {
SeccompProfile: SeccompDefaultPath, SeccompProfile: SeccompDefaultPath,
ShmSize: DefaultShmSize, ShmSize: DefaultShmSize,
UTSNS: "private", UTSNS: "private",
UserNS: "private", UserNS: "host",
UserNSSize: DefaultUserNSSize, UserNSSize: DefaultUserNSSize,
}, },
Network: NetworkConfig{ Network: NetworkConfig{

2
vendor/modules.txt vendored
View File

@ -82,7 +82,7 @@ github.com/containers/buildah/pkg/secrets
github.com/containers/buildah/pkg/supplemented github.com/containers/buildah/pkg/supplemented
github.com/containers/buildah/pkg/umask github.com/containers/buildah/pkg/umask
github.com/containers/buildah/util 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/apparmor
github.com/containers/common/pkg/auth github.com/containers/common/pkg/auth
github.com/containers/common/pkg/capabilities github.com/containers/common/pkg/capabilities