Merge pull request #6868 from mheon/fix_mount_rootless

Fix bug where `podman mount` didn't error as rootless
This commit is contained in:
OpenShift Merge Robot
2020-07-06 16:41:59 -04:00
committed by GitHub
2 changed files with 10 additions and 4 deletions

View File

@ -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,
}
)

View File

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