diff options
author | baude <bbaude@redhat.com> | 2019-04-11 08:51:42 -0500 |
---|---|---|
committer | baude <bbaude@redhat.com> | 2019-04-11 13:51:50 -0500 |
commit | 495f2ce5150bc8ab042a24967a08da22a2465b3b (patch) | |
tree | b48e288ac75f1d7fb85cd20f07fcb70e03ff8229 /cmd/podman/shared/intermediate.go | |
parent | 4596c39655f7ff5e741adbc97aaa49bb3a9d453e (diff) | |
download | podman-495f2ce5150bc8ab042a24967a08da22a2465b3b.tar.gz podman-495f2ce5150bc8ab042a24967a08da22a2465b3b.tar.bz2 podman-495f2ce5150bc8ab042a24967a08da22a2465b3b.zip |
Fixes for podman-remote run and attach
Fixes the ability to run (create,start) a container and attach to its
console correctly. We can now also exit from the console without
hanging the remote client.
Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'cmd/podman/shared/intermediate.go')
-rw-r--r-- | cmd/podman/shared/intermediate.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cmd/podman/shared/intermediate.go b/cmd/podman/shared/intermediate.go index 9afbd68c8..2e1827561 100644 --- a/cmd/podman/shared/intermediate.go +++ b/cmd/podman/shared/intermediate.go @@ -360,7 +360,7 @@ func newCRStringArray(c *cliconfig.PodmanCommand, flag string) CRStringArray { } // NewIntermediateLayer creates a GenericCLIResults from a create or run cli-command -func NewIntermediateLayer(c *cliconfig.PodmanCommand) GenericCLIResults { +func NewIntermediateLayer(c *cliconfig.PodmanCommand, remote bool) GenericCLIResults { m := make(map[string]GenericCLIResult) m["add-host"] = newCRStringSlice(c, "add-host") @@ -458,8 +458,10 @@ func NewIntermediateLayer(c *cliconfig.PodmanCommand) GenericCLIResults { m["volumes-from"] = newCRStringSlice(c, "volumes-from") m["workdir"] = newCRString(c, "workdir") // global flag - m["trace"] = newCRBool(c, "trace") - m["syslog"] = newCRBool(c, "syslog") + if !remote { + m["trace"] = newCRBool(c, "trace") + m["syslog"] = newCRBool(c, "syslog") + } return GenericCLIResults{m, c.InputArgs} } |