vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Alphabetize kpod create flags and move them into common.go

Browse source 
Create flags will be shared with run, so they should be in a
common file.

Signed-off-by: Matthew Heon <mheon@redhat.com>
This commit is contained in:
Matthew Heon 2017-10-06 10:43:05 -04:00
parent 899f672ee9
commit 45808ca998
2 changed files with 122 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

116
cmd/kpod/common.go
View file

@ -133,3 +133,119 @@ func validateFlags(c *cli.Context, flags []cli.Flag) error {
}
return nil
}
// Common flags shared between commands
var createFlags = []cli.Flag{
cli.StringSliceFlag{
Name: "cap-add",
Usage: "Add capabilities to the container",
},
cli.StringSliceFlag{
Name: "cap-drop",
Usage: "Drop capabilities from the container",
},
cli.StringFlag{
Name: "cgroup-parent",
Usage: "Set CGroup parent",
Value: defaultCgroupParent,
},
cli.BoolFlag{
Name: "detach, d",
Usage: "Start container detached",
},
cli.StringSliceFlag{
Name: "device",
Usage: "Mount devices into the container",
},
cli.StringSliceFlag{
Name: "dns",
Usage: "Set custom DNS servers",
},
cli.StringSliceFlag{
Name: "dns-opt",
Usage: "Set custom DNS options",
},
cli.StringSliceFlag{
Name: "dns-search",
Usage: "Set custom DNS search domains",
},
cli.StringSliceFlag{
Name: "env, e",
Usage: "Set environment variables in container",
},
cli.StringSliceFlag{
Name: "expose",
Usage: "Expose a port",
},
cli.StringFlag{
Name: "group-add",
Usage: "Specify additional groups to run as",
},
cli.StringFlag{
Name: "hostname, h",
Usage: "Set hostname",
Value: defaultHostname,
},
cli.BoolFlag{
Name: "interactive, i",
Usage: "Keep STDIN open even if deatched",
},
cli.StringFlag{
Name: "ipc",
Usage: "Use `host` IPC namespace",
},
cli.StringSliceFlag{
Name: "label",
Usage: "Set label metadata on container",
},
cli.StringFlag{
Name: "name",
Usage: "Assign a name to the container",
},
cli.StringFlag{
Name: "network",
Usage: "Use `host` network namespace",
},
cli.StringFlag{
Name: "pid",
Usage: "Use `host` PID namespace",
},
cli.StringFlag{
Name: "pod",
Usage: "Run container in an existing pod",
},
cli.BoolFlag{
Name: "privileged",
Usage: "Run a privileged container",
},
cli.BoolFlag{
Name: "read-only",
Usage: "Make root filesystem read-only",
},
cli.BoolFlag{
Name: "rm",
Usage: "Remove container (and pod if created) after exit",
},
cli.StringFlag{
Name: "sysctl",
Usage: "Set namespaced SYSCTLs",
},
cli.BoolFlag{
Name: "tty, t",
Usage: "Allocate a TTY for container",
},
cli.StringFlag{
Name: "user, u",
Usage: "Specify user to run as",
},
cli.StringSliceFlag{
Name: "volume, v",
Usage: "Mount volumes into the container",
},
cli.StringFlag{
Name: "workdir, w",
Usage: "Set working `directory` of container",
Value: "/",
},
}

120
cmd/kpod/create.go
View file

@ -53,124 +53,16 @@ type createConfig struct {
readOnlyRootfs bool
}
var createFlags = []cli.Flag{
cli.StringFlag{
Name: "pod",
Usage: "Run container in an existing pod",
},
cli.BoolFlag{
Name: "privileged",
Usage: "Run a privileged container",
},
cli.BoolFlag{
Name: "rm",
Usage: "Remove container (and pod if created) after exit",
},
cli.StringFlag{
Name: "network",
Usage: "Use `host` network namespace",
},
cli.StringFlag{
Name: "pid",
Usage: "Use `host` PID namespace",
},
cli.StringFlag{
Name: "ipc",
Usage: "Use `host` IPC namespace",
},
cli.StringFlag{
Name: "name",
Usage: "Assign a name to the container",
},
cli.StringSliceFlag{
Name: "label",
Usage: "Set label metadata on container",
},
cli.StringFlag{
Name: "workdir, w",
Usage: "Set working `directory` of container",
Value: "/",
},
cli.StringSliceFlag{
Name: "env, e",
Usage: "Set environment variables in container",
},
cli.BoolFlag{
Name: "detach, d",
Usage: "Start container detached",
},
cli.BoolFlag{
Name: "interactive, i",
Usage: "Keep STDIN open even if deatched",
},
cli.BoolFlag{
Name: "tty, t",
Usage: "Allocate a TTY for container",
},
cli.StringSliceFlag{
Name: "device",
Usage: "Mount devices into the container",
},
cli.StringSliceFlag{
Name: "volume, v",
Usage: "Mount volumes into the container",
},
cli.StringSliceFlag{
Name: "cap-add",
Usage: "Add capabilities to the container",
},
cli.StringSliceFlag{
Name: "cap-drop",
Usage: "Drop capabilities from the container",
},
cli.StringSliceFlag{
Name: "dns",
Usage: "Set custom DNS servers",
},
cli.StringSliceFlag{
Name: "dns-search",
Usage: "Set custom DNS search domains",
},
cli.StringSliceFlag{
Name: "dns-opt",
Usage: "Set custom DNS options",
},
cli.StringSliceFlag{
Name: "expose",
Usage: "Expose a port",
},
cli.StringFlag{
Name: "hostname, h",
Usage: "Set hostname",
Value: defaultHostname,
},
cli.StringFlag{
Name: "cgroup-parent",
Usage: "Set CGroup parent",
Value: defaultCgroupParent,
},
cli.StringFlag{
Name: "sysctl",
Usage: "Set namespaced SYSCTLs",
},
cli.StringFlag{
Name: "user, u",
Usage: "Specify user to run as",
},
cli.StringFlag{
Name: "group-add",
Usage: "Specify additional groups to run as",
},
cli.BoolFlag{
Name: "read-only",
Usage: "Make root filesystem read-only",
},
}
var createDescription = "Creates a new container from the given image or" +
" storage and prepares it for running the specified command. The" +
" container ID is then printed to stdout. You can then start it at" +
" any time with the kpod start <container_id> command. The container" +
" will be created with the initial state 'created'."
var createCommand = cli.Command{
Name: "create",
Usage: "create but do not start a container",
Description: `Create a new container from specified image, but do not start it`,
Description: createDescription,
Flags: createFlags,
Action: createCmd,
ArgsUsage: "IMAGE [COMMAND [ARG...]]",