From 0883d55bb8882697cc0c21814460baacc5faaa00 Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Mon, 1 Aug 2016 11:45:28 -0700 Subject: [PATCH] Replace `"workdir'` with const, same as other flags in `service create` This is a minor fix that tries to replace `"workdir"` with const in `service create`. Since `"workdir"` is the only string not defined as const in `func addServiceFlags()`, I think it makes sense to replace `"workdir"` with a const to be consistent. The flag `"workdir"` in `service update` has also been replaced. Signed-off-by: Yong Tang Upstream-commit: 55d05fc0556dc7d3ff3c65b8d739e48a1f79afab Component: engine --- components/engine/api/client/service/opts.go | 3 ++- components/engine/api/client/service/update.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/components/engine/api/client/service/opts.go b/components/engine/api/client/service/opts.go index f32bd05d53..9afb307625 100644 --- a/components/engine/api/client/service/opts.go +++ b/components/engine/api/client/service/opts.go @@ -488,7 +488,7 @@ func addServiceFlags(cmd *cobra.Command, opts *serviceOptions) { flags := cmd.Flags() flags.StringVar(&opts.name, flagName, "", "Service name") - flags.StringVarP(&opts.workdir, "workdir", "w", "", "Working directory inside the container") + flags.StringVarP(&opts.workdir, flagWorkdir, "w", "", "Working directory inside the container") flags.StringVarP(&opts.user, flagUser, "u", "", "Username or UID") flags.Var(&opts.resources.limitCPU, flagLimitCPU, "Limit CPUs") @@ -555,6 +555,7 @@ const ( flagUpdateFailureAction = "update-failure-action" flagUpdateParallelism = "update-parallelism" flagUser = "user" + flagWorkdir = "workdir" flagRegistryAuth = "with-registry-auth" flagLogDriver = "log-driver" flagLogOpt = "log-opt" diff --git a/components/engine/api/client/service/update.go b/components/engine/api/client/service/update.go index ac1eac3cac..b361f88afc 100644 --- a/components/engine/api/client/service/update.go +++ b/components/engine/api/client/service/update.go @@ -152,7 +152,7 @@ func updateService(flags *pflag.FlagSet, spec *swarm.ServiceSpec) error { updateString("image", &cspec.Image) updateStringToSlice(flags, "args", &cspec.Args) updateEnvironment(flags, &cspec.Env) - updateString("workdir", &cspec.Dir) + updateString(flagWorkdir, &cspec.Dir) updateString(flagUser, &cspec.User) updateMounts(flags, &cspec.Mounts)