diff options
author | umohnani8 <umohnani@redhat.com> | 2018-04-03 13:37:25 -0400 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-04-06 00:09:46 +0000 |
commit | 998fd2ece0480e581e013124d0969a1af6305110 (patch) | |
tree | 84f3ae049fb1246a2f31c5eb5f55b40e6a17fc81 /cmd/podman/create.go | |
parent | c3e2b00333d42dc87a3385939715813006cc8af1 (diff) | |
download | podman-998fd2ece0480e581e013124d0969a1af6305110.tar.gz podman-998fd2ece0480e581e013124d0969a1af6305110.tar.bz2 podman-998fd2ece0480e581e013124d0969a1af6305110.zip |
Functionality changes to the following flags
--group-add
--blkio-weight-device
--device-read-bps
--device-write-bps
--device-read-iops
--device-write-iops
--group-add now supports group names as well as the gid associated with them.
All the --device flags work now with moderate changes to the code to support both
bps and iops.
Added tests for all the flags.
Signed-off-by: umohnani8 <umohnani@redhat.com>
Closes: #590
Approved by: mheon
Diffstat (limited to 'cmd/podman/create.go')
-rw-r--r-- | cmd/podman/create.go | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/cmd/podman/create.go b/cmd/podman/create.go index a25f31717..8bf61a2ca 100644 --- a/cmd/podman/create.go +++ b/cmd/podman/create.go @@ -86,7 +86,7 @@ type createConfig struct { Entrypoint []string //entrypoint Env map[string]string //env ExposedPorts map[nat.Port]struct{} - GroupAdd []uint32 // group-add + GroupAdd []string // group-add HostAdd []string //add-host Hostname string //hostname Image string @@ -208,6 +208,7 @@ func createCmd(c *cli.Context) error { options = append(options, libpod.WithUser(createConfig.User)) options = append(options, libpod.WithShmDir(createConfig.ShmDir)) options = append(options, libpod.WithShmSize(createConfig.Resources.ShmSize)) + options = append(options, libpod.WithGroups(createConfig.GroupAdd)) ctr, err := runtime.NewContainer(runtimeSpec, options...) if err != nil { return err @@ -406,11 +407,6 @@ func parseCreateOpts(c *cli.Context, runtime *libpod.Runtime, imageName string, return nil, errors.Wrapf(err, "invalid value for sysctl") } - groupAdd, err := stringSlicetoUint32Slice(c.StringSlice("group-add")) - if err != nil { - return nil, errors.Wrapf(err, "invalid value for groups provided") - } - if c.String("memory") != "" { memoryLimit, err = units.RAMInBytes(c.String("memory")) if err != nil { @@ -625,7 +621,7 @@ func parseCreateOpts(c *cli.Context, runtime *libpod.Runtime, imageName string, Entrypoint: entrypoint, Env: env, //ExposedPorts: ports, - GroupAdd: groupAdd, + GroupAdd: c.StringSlice("group-add"), Hostname: c.String("hostname"), HostAdd: c.StringSlice("add-host"), Image: imageName, |