mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #14626 from kunalkushwaha/add-network-cli-help
"docker network" missing from docker --help
This commit is contained in:
commit
a796ac5318
3 changed files with 22 additions and 8 deletions
|
@ -3,8 +3,6 @@
|
||||||
package client
|
package client
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"os"
|
|
||||||
|
|
||||||
nwclient "github.com/docker/libnetwork/client"
|
nwclient "github.com/docker/libnetwork/client"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -12,5 +10,5 @@ import (
|
||||||
func (cli *DockerCli) CmdNetwork(args ...string) error {
|
func (cli *DockerCli) CmdNetwork(args ...string) error {
|
||||||
nCli := nwclient.NewNetworkCli(cli.out, cli.err, nwclient.CallFunc(cli.callWrapper))
|
nCli := nwclient.NewNetworkCli(cli.out, cli.err, nwclient.CallFunc(cli.callWrapper))
|
||||||
args = append([]string{"network"}, args...)
|
args = append([]string{"network"}, args...)
|
||||||
return nCli.Cmd(os.Args[0], args...)
|
return nCli.Cmd("docker", args...)
|
||||||
}
|
}
|
||||||
|
|
12
docker/flags_experimental.go
Normal file
12
docker/flags_experimental.go
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
// +build experimental
|
||||||
|
|
||||||
|
package main
|
||||||
|
|
||||||
|
import "sort"
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
dockerCommands = append(dockerCommands, command{"network", "Network management"})
|
||||||
|
|
||||||
|
//Sorting logic required here to pass Command Sort Test.
|
||||||
|
sort.Sort(byName(dockerCommands))
|
||||||
|
}
|
|
@ -202,9 +202,10 @@ func (s *DockerSuite) TestHelpTextVerify(c *check.C) {
|
||||||
|
|
||||||
// These commands will never print a short-usage so don't test
|
// These commands will never print a short-usage so don't test
|
||||||
noShortUsage := map[string]string{
|
noShortUsage := map[string]string{
|
||||||
"images": "",
|
"images": "",
|
||||||
"login": "",
|
"login": "",
|
||||||
"logout": "",
|
"logout": "",
|
||||||
|
"network": "",
|
||||||
}
|
}
|
||||||
|
|
||||||
if _, ok := noShortUsage[cmd]; !ok {
|
if _, ok := noShortUsage[cmd]; !ok {
|
||||||
|
@ -257,11 +258,14 @@ func (s *DockerSuite) TestHelpTextVerify(c *check.C) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
expected := 40
|
// Number of commands for standard release and experimental release
|
||||||
|
standard := 40
|
||||||
|
experimental := 1
|
||||||
|
expected := standard + experimental
|
||||||
if isLocalDaemon {
|
if isLocalDaemon {
|
||||||
expected++ // for the daemon command
|
expected++ // for the daemon command
|
||||||
}
|
}
|
||||||
if len(cmds) != expected {
|
if len(cmds) > expected {
|
||||||
c.Fatalf("Wrong # of cmds(%d), it should be: %d\nThe list:\n%q",
|
c.Fatalf("Wrong # of cmds(%d), it should be: %d\nThe list:\n%q",
|
||||||
len(cmds), expected, cmds)
|
len(cmds), expected, cmds)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue