mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
e3f484241d
This fix is related to 27049 and 27047. For `--label` flag, if string slice is used (like 27047), then quote can not be used in command and will result in an error : ``` line 1, column 14: bare " in non-quoted-field ``` The issue 27047 has been fixed by 27049. Recently I found out that both `docker network create --label` and `docker volume create --label` still use string slice and will return the same error when quotes are used. This fix fixes `docker network create --label` and `docker volume create --label` by using `ListOpt` (as 27049) as well. This fix has been tested and verified manually. Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
111 lines
3.3 KiB
Go
111 lines
3.3 KiB
Go
package volume
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"golang.org/x/net/context"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
"github.com/docker/docker/cli"
|
|
"github.com/docker/docker/cli/command"
|
|
"github.com/docker/docker/opts"
|
|
runconfigopts "github.com/docker/docker/runconfig/opts"
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
type createOptions struct {
|
|
name string
|
|
driver string
|
|
driverOpts opts.MapOpts
|
|
labels opts.ListOpts
|
|
}
|
|
|
|
func newCreateCommand(dockerCli *command.DockerCli) *cobra.Command {
|
|
opts := createOptions{
|
|
driverOpts: *opts.NewMapOpts(nil, nil),
|
|
labels: opts.NewListOpts(runconfigopts.ValidateEnv),
|
|
}
|
|
|
|
cmd := &cobra.Command{
|
|
Use: "create [OPTIONS] [VOLUME]",
|
|
Short: "Create a volume",
|
|
Long: createDescription,
|
|
Args: cli.RequiresMaxArgs(1),
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
if len(args) == 1 {
|
|
if opts.name != "" {
|
|
fmt.Fprint(dockerCli.Err(), "Conflicting options: either specify --name or provide positional arg, not both\n")
|
|
return cli.StatusError{StatusCode: 1}
|
|
}
|
|
opts.name = args[0]
|
|
}
|
|
return runCreate(dockerCli, opts)
|
|
},
|
|
}
|
|
flags := cmd.Flags()
|
|
flags.StringVarP(&opts.driver, "driver", "d", "local", "Specify volume driver name")
|
|
flags.StringVar(&opts.name, "name", "", "Specify volume name")
|
|
flags.Lookup("name").Hidden = true
|
|
flags.VarP(&opts.driverOpts, "opt", "o", "Set driver specific options")
|
|
flags.Var(&opts.labels, "label", "Set metadata for a volume")
|
|
|
|
return cmd
|
|
}
|
|
|
|
func runCreate(dockerCli *command.DockerCli, opts createOptions) error {
|
|
client := dockerCli.Client()
|
|
|
|
volReq := types.VolumeCreateRequest{
|
|
Driver: opts.driver,
|
|
DriverOpts: opts.driverOpts.GetAll(),
|
|
Name: opts.name,
|
|
Labels: runconfigopts.ConvertKVStringsToMap(opts.labels.GetAll()),
|
|
}
|
|
|
|
vol, err := client.VolumeCreate(context.Background(), volReq)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
fmt.Fprintf(dockerCli.Out(), "%s\n", vol.Name)
|
|
return nil
|
|
}
|
|
|
|
var createDescription = `
|
|
Creates a new volume that containers can consume and store data in. If a name
|
|
is not specified, Docker generates a random name. You create a volume and then
|
|
configure the container to use it, for example:
|
|
|
|
$ docker volume create hello
|
|
hello
|
|
$ docker run -d -v hello:/world busybox ls /world
|
|
|
|
The mount is created inside the container's **/src** directory. Docker doesn't
|
|
not support relative paths for mount points inside the container.
|
|
|
|
Multiple containers can use the same volume in the same time period. This is
|
|
useful if two containers need access to shared data. For example, if one
|
|
container writes and the other reads the data.
|
|
|
|
## Driver specific options
|
|
|
|
Some volume drivers may take options to customize the volume creation. Use the
|
|
**-o** or **--opt** flags to pass driver options:
|
|
|
|
$ docker volume create --driver fake --opt tardis=blue --opt timey=wimey
|
|
|
|
These options are passed directly to the volume driver. Options for different
|
|
volume drivers may do different things (or nothing at all).
|
|
|
|
The built-in **local** driver on Windows does not support any options.
|
|
|
|
The built-in **local** driver on Linux accepts options similar to the linux
|
|
**mount** command:
|
|
|
|
$ docker volume create --driver local --opt type=tmpfs --opt device=tmpfs --opt o=size=100m,uid=1000
|
|
|
|
Another example:
|
|
|
|
$ docker volume create --driver local --opt type=btrfs --opt device=/dev/sda2
|
|
|
|
`
|