From 85148aa3f1206942c0b150e0b1ab9b57dea324f5 Mon Sep 17 00:00:00 2001 From: Simon Ferquel Date: Thu, 21 Mar 2019 16:19:06 +0100 Subject: [PATCH 1/2] Fix annnotation on docker config create --template-driver Signed-off-by: Simon Ferquel (cherry picked from commit 470afe11edaa306f0e74d7367cd8ce37f342dc14) Signed-off-by: Sebastiaan van Stijn --- cli/command/config/create.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/command/config/create.go b/cli/command/config/create.go index 04130313e6..0eac75a553 100644 --- a/cli/command/config/create.go +++ b/cli/command/config/create.go @@ -40,7 +40,7 @@ func newConfigCreateCommand(dockerCli command.Cli) *cobra.Command { flags := cmd.Flags() flags.VarP(&createOpts.labels, "label", "l", "Config labels") flags.StringVar(&createOpts.templateDriver, "template-driver", "", "Template driver") - flags.SetAnnotation("driver", "version", []string{"1.37"}) + flags.SetAnnotation("template-driver", "version", []string{"1.37"}) return cmd } From 356eda4028ccef2076eb6836be0ba02a2022bed7 Mon Sep 17 00:00:00 2001 From: Sune Keller Date: Thu, 28 Mar 2019 16:18:50 +0100 Subject: [PATCH 2/2] Fix annotation on docker secret create --template-driver Signed-off-by: Sune Keller (cherry picked from commit 217308d96d6943a5b34d7e4b95530dec8908f696) Signed-off-by: Sebastiaan van Stijn --- cli/command/secret/create.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/command/secret/create.go b/cli/command/secret/create.go index 1739fefa9c..164a543b69 100644 --- a/cli/command/secret/create.go +++ b/cli/command/secret/create.go @@ -45,7 +45,7 @@ func newSecretCreateCommand(dockerCli command.Cli) *cobra.Command { flags.StringVarP(&options.driver, "driver", "d", "", "Secret driver") flags.SetAnnotation("driver", "version", []string{"1.31"}) flags.StringVar(&options.templateDriver, "template-driver", "", "Template driver") - flags.SetAnnotation("driver", "version", []string{"1.37"}) + flags.SetAnnotation("template-driver", "version", []string{"1.37"}) return cmd }