From 7a2e041524c8e9618d0f6a030df5270876dc3c18 Mon Sep 17 00:00:00 2001
From: Nicolas De Loof <nicolas.deloof@gmail.com>
Date: Mon, 14 Dec 2020 14:51:37 +0100
Subject: [PATCH] Parse --version and forward to docker/cli
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
---
cli/main.go | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/cli/main.go b/cli/main.go
index 13ea7911d..026af7b9f 100644
--- a/cli/main.go
+++ b/cli/main.go
@@ -147,8 +147,8 @@ func main() {
root.PersistentFlags().BoolVarP(&opts.Debug, "debug", "D", false, "Enable debug output in the logs")
root.PersistentFlags().StringVarP(&opts.Host, "host", "H", "", "Daemon socket(s) to connect to")
- opts.AddConfigFlags(root.PersistentFlags())
opts.AddContextFlags(root.PersistentFlags())
+ opts.AddConfigFlags(root.PersistentFlags())
root.Flags().BoolVarP(&opts.Version, "version", "v", false, "Print version information and quit")
walk(root, func(c *cobra.Command) {
@@ -157,6 +157,7 @@ func main() {
// populate the opts with the global flags
_ = root.PersistentFlags().Parse(os.Args[1:])
+ _ = root.Flags().Parse(os.Args[1:])
if opts.Debug {
logrus.SetLevel(logrus.DebugLevel)
}