瀏覽代碼

node rm can be applied on not only active node

Signed-off-by: allencloud <allen.sun@daocloud.io>
allencloud 8 年之前
父節點
當前提交
002262d6f5

+ 1 - 1
api/swagger.yaml

@@ -6176,7 +6176,7 @@ paths:
           required: true
           required: true
         - name: "force"
         - name: "force"
           in: "query"
           in: "query"
-          description: "Force remove an active node"
+          description: "Force remove a node from the swarm"
           default: false
           default: false
           type: "boolean"
           type: "boolean"
       tags:
       tags:

+ 1 - 1
cli/command/node/remove.go

@@ -29,7 +29,7 @@ func newRemoveCommand(dockerCli *command.DockerCli) *cobra.Command {
 		},
 		},
 	}
 	}
 	flags := cmd.Flags()
 	flags := cmd.Flags()
-	flags.BoolVar(&opts.force, "force", false, "Force remove an active node")
+	flags.BoolVar(&opts.force, "force", false, "Force remove a node from the swarm")
 	return cmd
 	return cmd
 }
 }
 
 

+ 1 - 1
contrib/completion/zsh/_docker

@@ -818,7 +818,7 @@ __docker_node_subcommand() {
         (rm|remove)
         (rm|remove)
              _arguments $(__docker_arguments) \
              _arguments $(__docker_arguments) \
                 $opts_help \
                 $opts_help \
-                "($help)--force[Force remove an active node]" \
+                "($help)--force[Force remove a node from the swarm]" \
                 "($help -)*:node:__docker_complete_pending_nodes" && ret=0
                 "($help -)*:node:__docker_complete_pending_nodes" && ret=0
             ;;
             ;;
         (demote)
         (demote)

+ 1 - 1
docs/reference/api/docker_remote_api_v1.24.md

@@ -4064,7 +4064,7 @@ Remove a node [`id`] from the swarm.
 
 
 **Query parameters**:
 **Query parameters**:
 
 
--   **force** - 1/True/true or 0/False/false, Force remove an active node.
+-   **force** - 1/True/true or 0/False/false, Force remove a node from the swarm.
         Default `false`.
         Default `false`.
 
 
 **Status codes**:
 **Status codes**:

+ 1 - 1
docs/reference/api/docker_remote_api_v1.25.md

@@ -4589,7 +4589,7 @@ Remove a node [`id`] from the swarm.
 
 
 **Query parameters**:
 **Query parameters**:
 
 
--   **force** - 1/True/true or 0/False/false, Force remove an active node.
+-   **force** - 1/True/true or 0/False/false, Force remove a node from the swarm.
         Default `false`.
         Default `false`.
 
 
 **Status codes**:
 **Status codes**:

+ 1 - 1
docs/reference/commandline/node_rm.md

@@ -24,7 +24,7 @@ Aliases:
   rm, remove
   rm, remove
 
 
 Options:
 Options:
-      --force  Force remove an active node
+      --force  Force remove a node from the swarm
       --help   Print usage
       --help   Print usage
 ```
 ```