diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-06 19:51:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-06 19:51:21 -0400 |
| commit | 6dae4bae2e29fd16996b67b59df6d1d11fe43981 (patch) | |
| tree | 6a7d8e606263e9ec2b78ec50c3a8f379e9dc1d33 | |
| parent | e3e2b1e65930bfc40c5b60802c4d6ea175169732 (diff) | |
| parent | 8ab0abbb06b310707eee0a5ece0f9fb0bac8d234 (diff) | |
| download | podman-6dae4bae2e29fd16996b67b59df6d1d11fe43981.tar.gz podman-6dae4bae2e29fd16996b67b59df6d1d11fe43981.tar.bz2 podman-6dae4bae2e29fd16996b67b59df6d1d11fe43981.zip | |
Merge pull request #6874 from mheon/backport_mount_fix
Backport 'podman mount' bugfix
| -rw-r--r-- | cmd/podman/containers/mount.go | 13 | ||||
| -rw-r--r-- | test/e2e/mount_test.go | 1 |
2 files changed, 10 insertions, 4 deletions
diff --git a/cmd/podman/containers/mount.go b/cmd/podman/containers/mount.go index 44af27801..37ee92177 100644 --- a/cmd/podman/containers/mount.go +++ b/cmd/podman/containers/mount.go @@ -30,13 +30,18 @@ var ( Args: func(cmd *cobra.Command, args []string) error { return validate.CheckAllLatestAndCIDFile(cmd, args, true, false) }, + Annotations: map[string]string{ + registry.ParentNSRequired: "", + }, } containerMountCommmand = &cobra.Command{ - Use: mountCommand.Use, - Short: mountCommand.Short, - Long: mountCommand.Long, - RunE: mountCommand.RunE, + Use: mountCommand.Use, + Short: mountCommand.Short, + Long: mountCommand.Long, + RunE: mountCommand.RunE, + Args: mountCommand.Args, + Annotations: mountCommand.Annotations, } ) diff --git a/test/e2e/mount_test.go b/test/e2e/mount_test.go index dd74f245e..657daedef 100644 --- a/test/e2e/mount_test.go +++ b/test/e2e/mount_test.go @@ -18,6 +18,7 @@ var _ = Describe("Podman mount", func() { ) BeforeEach(func() { + SkipIfRootless() tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) |