diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-02-28 03:54:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-28 03:54:53 +0100 |
| commit | bbf54aaab7a4dacbbeec37a76126d953b47ef98a (patch) | |
| tree | 50fd9e340d96b2fa560f85da6c12b3fb9771329a /cmd/podman/create.go | |
| parent | 6f0dbd004fecadb6d0d07bb8012231d25d61684f (diff) | |
| parent | 37f447d78ec88267f81c6eb3843a63bf9f36e268 (diff) | |
| download | podman-bbf54aaab7a4dacbbeec37a76126d953b47ef98a.tar.gz podman-bbf54aaab7a4dacbbeec37a76126d953b47ef98a.tar.bz2 podman-bbf54aaab7a4dacbbeec37a76126d953b47ef98a.zip | |
Merge pull request #2476 from mheon/fix_stop
Fix ignored --stop-timeout flag to 'podman create'
Diffstat (limited to 'cmd/podman/create.go')
| -rw-r--r-- | cmd/podman/create.go | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/cmd/podman/create.go b/cmd/podman/create.go index 696d10d8e..95cb732d9 100644 --- a/cmd/podman/create.go +++ b/cmd/podman/create.go @@ -408,7 +408,7 @@ func parseCreateOpts(ctx context.Context, c *cliconfig.PodmanCommand, runtime *l return nil, err } - if err = parseVolumesFrom(c.StringArray("volumes-from")); err != nil { + if err = parseVolumesFrom(c.StringSlice("volumes-from")); err != nil { return nil, err } @@ -707,23 +707,23 @@ func parseCreateOpts(ctx context.Context, c *cliconfig.PodmanCommand, runtime *l Entrypoint: entrypoint, Env: env, //ExposedPorts: ports, - GroupAdd: c.StringSlice("group-add"), - Hostname: c.String("hostname"), - HostAdd: c.StringSlice("add-host"), - IDMappings: idmappings, - Image: imageName, - ImageID: imageID, - Interactive: c.Bool("interactive"), - IP6Address: c.String("ipv6"), - IPAddress: c.String("ip"), - Labels: labels, - LinkLocalIP: c.StringSlice("link-local-ip"), - LogDriver: c.String("log-driver"), - LogDriverOpt: c.StringSlice("log-opt"), - MacAddress: c.String("mac-address"), - Name: c.String("name"), - Network: network, - NetworkAlias: c.StringSlice("network-alias"), + GroupAdd: c.StringSlice("group-add"), + Hostname: c.String("hostname"), + HostAdd: c.StringSlice("add-host"), + IDMappings: idmappings, + Image: imageName, + ImageID: imageID, + Interactive: c.Bool("interactive"), + //IP6Address: c.String("ipv6"), // Not implemented yet - needs CNI support for static v6 + IPAddress: c.String("ip"), + Labels: labels, + //LinkLocalIP: c.StringSlice("link-local-ip"), // Not implemented yet + LogDriver: c.String("log-driver"), + LogDriverOpt: c.StringSlice("log-opt"), + MacAddress: c.String("mac-address"), + Name: c.String("name"), + Network: network, + //NetworkAlias: c.StringSlice("network-alias"), // Not implemented - does this make sense in Podman? IpcMode: ipcMode, NetMode: netMode, UtsMode: utsMode, |