Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27333 from yongtang/27049-ListOpt 

Use ListOpt for `docker network create --label` and `docker volume create --label`
This commit is contained in:
Sebastiaan van Stijn 2016-10-14 00:31:09 -07:00 committed by GitHub
parent bfe16dcfe2 49e49e8e00
commit b2de6e55bd
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
command/network/create.go
View File

@ -20,7 +20,7 @@ type createOptions struct {
name string name string
driver string driver string
driverOpts opts.MapOpts driverOpts opts.MapOpts
labels []string labels opts.ListOpts
internal bool internal bool
ipv6 bool ipv6 bool
attachable bool attachable bool
@ -36,6 +36,7 @@ type createOptions struct {
func newCreateCommand(dockerCli *command.DockerCli) *cobra.Command { func newCreateCommand(dockerCli *command.DockerCli) *cobra.Command {
opts := createOptions{ opts := createOptions{
driverOpts: *opts.NewMapOpts(nil, nil), driverOpts: *opts.NewMapOpts(nil, nil),
labels: opts.NewListOpts(runconfigopts.ValidateEnv),
ipamAux: *opts.NewMapOpts(nil, nil), ipamAux: *opts.NewMapOpts(nil, nil),
ipamOpt: *opts.NewMapOpts(nil, nil), ipamOpt: *opts.NewMapOpts(nil, nil),
} }
@ -53,7 +54,7 @@ func newCreateCommand(dockerCli *command.DockerCli) *cobra.Command {
flags := cmd.Flags() flags := cmd.Flags()
flags.StringVarP(&opts.driver, "driver", "d", "bridge", "Driver to manage the Network") flags.StringVarP(&opts.driver, "driver", "d", "bridge", "Driver to manage the Network")
flags.VarP(&opts.driverOpts, "opt", "o", "Set driver specific options") flags.VarP(&opts.driverOpts, "opt", "o", "Set driver specific options")
flags.StringSliceVar(&opts.labels, "label", []string{}, "Set metadata on a network") flags.Var(&opts.labels, "label", "Set metadata on a network")
flags.BoolVar(&opts.internal, "internal", false, "Restrict external access to the network") flags.BoolVar(&opts.internal, "internal", false, "Restrict external access to the network")
flags.BoolVar(&opts.ipv6, "ipv6", false, "Enable IPv6 networking") flags.BoolVar(&opts.ipv6, "ipv6", false, "Enable IPv6 networking")
flags.BoolVar(&opts.attachable, "attachable", false, "Enable manual container attachment") flags.BoolVar(&opts.attachable, "attachable", false, "Enable manual container attachment")
@ -90,7 +91,7 @@ func runCreate(dockerCli *command.DockerCli, opts createOptions) error {
Internal: opts.internal, Internal: opts.internal,
EnableIPv6: opts.ipv6, EnableIPv6: opts.ipv6,
Attachable: opts.attachable, Attachable: opts.attachable,
Labels: runconfigopts.ConvertKVStringsToMap(opts.labels), Labels: runconfigopts.ConvertKVStringsToMap(opts.labels.GetAll()),
} }
resp, err := client.NetworkCreate(context.Background(), opts.name, nc) resp, err := client.NetworkCreate(context.Background(), opts.name, nc)

7
command/volume/create.go
View File

@ -17,12 +17,13 @@ type createOptions struct {
name string name string
driver string driver string
driverOpts opts.MapOpts driverOpts opts.MapOpts
labels []string labels opts.ListOpts
} }
func newCreateCommand(dockerCli *command.DockerCli) *cobra.Command { func newCreateCommand(dockerCli *command.DockerCli) *cobra.Command {
opts := createOptions{ opts := createOptions{
driverOpts: *opts.NewMapOpts(nil, nil), driverOpts: *opts.NewMapOpts(nil, nil),
labels: opts.NewListOpts(runconfigopts.ValidateEnv),
} }
cmd := &cobra.Command{ cmd := &cobra.Command{
@ -46,7 +47,7 @@ func newCreateCommand(dockerCli *command.DockerCli) *cobra.Command {
flags.StringVar(&opts.name, "name", "", "Specify volume name") flags.StringVar(&opts.name, "name", "", "Specify volume name")
flags.Lookup("name").Hidden = true flags.Lookup("name").Hidden = true
flags.VarP(&opts.driverOpts, "opt", "o", "Set driver specific options") flags.VarP(&opts.driverOpts, "opt", "o", "Set driver specific options")
flags.StringSliceVar(&opts.labels, "label", []string{}, "Set metadata for a volume") flags.Var(&opts.labels, "label", "Set metadata for a volume")
return cmd return cmd
} }
@ -58,7 +59,7 @@ func runCreate(dockerCli *command.DockerCli, opts createOptions) error {
Driver: opts.driver, Driver: opts.driver,
DriverOpts: opts.driverOpts.GetAll(), DriverOpts: opts.driverOpts.GetAll(),
Name: opts.name, Name: opts.name,
Labels: runconfigopts.ConvertKVStringsToMap(opts.labels), Labels: runconfigopts.ConvertKVStringsToMap(opts.labels.GetAll()),
} }
vol, err := client.VolumeCreate(context.Background(), volReq) vol, err := client.VolumeCreate(context.Background(), volReq)