Skip to content

Commit

Permalink
Merge pull request #26988 from thaJeztah/remove-service-update-name-flag
Browse files Browse the repository at this point in the history
Remove service update name flag
  • Loading branch information
thaJeztah committed Oct 27, 2016
2 parents 33474a1 + 047e44e commit 3a3a87b
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 7 deletions.
2 changes: 2 additions & 0 deletions cli/command/service/create.go
Expand Up @@ -27,6 +27,8 @@ func newCreateCommand(dockerCli *command.DockerCli) *cobra.Command {
}
flags := cmd.Flags()
flags.StringVar(&opts.mode, flagMode, "replicated", "Service mode (replicated or global)")
flags.StringVar(&opts.name, flagName, "", "Service name")

addServiceFlags(cmd, opts)

flags.VarP(&opts.labels, flagLabel, "l", "Service labels")
Expand Down
1 change: 0 additions & 1 deletion cli/command/service/opts.go
Expand Up @@ -511,7 +511,6 @@ func (opts *serviceOptions) ToService() (swarm.ServiceSpec, error) {
// Any flags that are not common are added separately in the individual command
func addServiceFlags(cmd *cobra.Command, opts *serviceOptions) {
flags := cmd.Flags()
flags.StringVar(&opts.name, flagName, "", "Service name")

flags.StringVarP(&opts.workdir, flagWorkdir, "w", "", "Working directory inside the container")
flags.StringVarP(&opts.user, flagUser, "u", "", "Username or UID (format: <name|uid>[:<group|gid>])")
Expand Down
1 change: 0 additions & 1 deletion cli/command/service/update.go
Expand Up @@ -172,7 +172,6 @@ func updateService(flags *pflag.FlagSet, spec *swarm.ServiceSpec) error {
return task.Resources
}

updateString(flagName, &spec.Name)
updateLabels(flags, &spec.Labels)
updateContainerLabels(flags, &cspec.Labels)
updateString("image", &cspec.Image)
Expand Down
2 changes: 1 addition & 1 deletion contrib/completion/bash/docker
Expand Up @@ -2576,7 +2576,6 @@ _docker_service_update() {
--log-driver
--log-opt
--mount
--name
--network
--publish -p
--replicas
Expand Down Expand Up @@ -2608,6 +2607,7 @@ _docker_service_update() {
options_with_args="$options_with_args
--container-label
--mode
--name
"

case "$prev" in
Expand Down
2 changes: 1 addition & 1 deletion contrib/completion/zsh/_docker
Expand Up @@ -1095,7 +1095,6 @@ __docker_service_subcommand() {
"($help)--log-driver=[Logging driver for service]:logging driver:__docker_log_drivers"
"($help)*--log-opt=[Logging driver options]:log driver options:__docker_log_options"
"($help)*--mount=[Attach a mount to the service]:mount: "
"($help)--name=[Service name]:name: "
"($help)*--network=[Network attachments]:network: "
"($help)*"{-p=,--publish=}"[Publish a port as a node port]:port: "
"($help)--replicas=[Number of tasks]:replicas: "
Expand Down Expand Up @@ -1123,6 +1122,7 @@ __docker_service_subcommand() {
$opts_create_update \
"($help)*--container-label=[Container labels]:label: " \
"($help)--mode=[Service Mode]:mode:(global replicated)" \
"($help)--name=[Service name]:name: " \
"($help -): :__docker_images" \
"($help -):command: _command_names -e" \
"($help -)*::arguments: _normal" && ret=0
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/api/docker_remote_api_v1.24.md
Expand Up @@ -4846,7 +4846,7 @@ image](#create-an-image) section for more details.

**JSON Parameters**:

- **Name** – User-defined name for the service.
- **Name** – User-defined name for the service. Note that renaming services is not supported.
- **Labels** – A map of labels to associate with the service (e.g., `{"key":"value", "key2":"value2"}`).
- **TaskTemplate** – Specification of the tasks to start as part of the new service.
- **ContainerSpec** - Container settings for containers started as part of this task.
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/api/docker_remote_api_v1.25.md
Expand Up @@ -5375,7 +5375,7 @@ image](#create-an-image) section for more details.

**JSON Parameters**:

- **Name** – User-defined name for the service.
- **Name** – User-defined name for the service. Note that renaming services is not supported.
- **Labels** – A map of labels to associate with the service (e.g., `{"key":"value", "key2":"value2"}`).
- **TaskTemplate** – Specification of the tasks to start as part of the new service.
- **ContainerSpec** - Container settings for containers started as part of this task.
Expand Down
1 change: 0 additions & 1 deletion docs/reference/commandline/service_update.md
Expand Up @@ -42,7 +42,6 @@ Options:
--log-opt value Logging driver options (default [])
--mount-add value Add or update a mount on a service
--mount-rm value Remove a mount by its target path (default [])
--name string Service name
--publish-add value Add or update a published port (default [])
--publish-rm value Remove a published port by its target port (default [])
--replicas value Number of tasks (default none)
Expand Down

0 comments on commit 3a3a87b

Please sign in to comment.