fixes

Signed-off-by: fahed dorgaa <fahed.dorgaa@gmail.com>

Author: fahedouch

cmd/nerdctl/main.go

@@ -228,6 +228,7 @@ Config file ($NERDCTL_TOML): %s
 		// #endregion
 
 		// #region Container management
+		newLogsCommand(),
 		newPsCommand(),
 		newPortCommand(),
 		newStopCommand(),
@@ -246,6 +247,7 @@ Config file ($NERDCTL_TOML): %s
 		newBuildCommand(),
 
 		// #region Image management
+		newImagesCommand(),
 		newPullCommand(),
 		newPushCommand(),
 		newLoadCommand(),
@@ -293,29 +295,12 @@ Config file ($NERDCTL_TOML): %s
 		// IPFS
 		newIPFSCommand(),
 	)
-
 	addApparmorCommand(rootCmd)
 	addCpCommand(rootCmd)
-	addLogsCommand(rootCmd)
-	addImagesCommand(rootCmd)
 
 	return rootCmd, nil
 }
 
-func addLogsCommand(rootCmd *cobra.Command) {
-	flagSet := rootCmd.PersistentFlags()
-	// remove Shorthand flag -n (conflicts with nerdctl logs -n)
-	flagSet.ShorthandLookup("n").Shorthand = ""
-	rootCmd.AddCommand(newLogsCommand())
-}
-
-func addImagesCommand(rootCmd *cobra.Command) {
-	flagSet := rootCmd.PersistentFlags()
-	// remove Shorthand flag -a (conflicts with nerdctl images -a)
-	flagSet.ShorthandLookup("a").Shorthand = ""
-	rootCmd.AddCommand(newImagesCommand())
-}
-
 func globalFlags(cmd *cobra.Command) (string, []string) {
 	args0, err := os.Executable()
 	if err != nil {

go.mod

@@ -89,7 +89,7 @@ require (
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/imdario/mergo v0.3.13 // indirect
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/inconshreveable/mousetrap v1.0.1 // indirect
 	github.com/ipfs/bbloom v0.0.4 // indirect
 	github.com/ipfs/go-block-format v0.0.3 // indirect
 	github.com/ipfs/go-blockservice v0.3.0 // indirect
@@ -185,4 +185,7 @@ replace (
 	github.com/containerd/containerd => github.com/containerd/containerd v1.6.1-0.20220807041520-6deb1174fbfc
 	// Temporary fork for avoiding importing patent-protected code: https://github.com/hashicorp/golang-lru/issues/73
 	github.com/hashicorp/golang-lru => github.com/ktock/golang-lru v0.5.5-0.20211029085301-ec551be6f75c
+	// Temporary fork for parent flags persistence: https://github.com/spf13/cobra/pull/1795
+	github.com/spf13/cobra => github.com/fahedouch/cobra v0.0.0-20220905130657-0c653d6e38ad
+	github.com/spf13/pflag => github.com/fahedouch/pflag v0.0.0-20220905133355-1113e9b3fb8b
 )