diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-10-11 20:55:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-11 20:55:37 +0200 |
| commit | 79d05b99cfee2f7841c0568fbe4def4fbc095c5c (patch) | |
| tree | dce255b558c740c7f22b931e6258089c7a525a68 /pkg/adapter/terminal_linux.go | |
| parent | cee6478f9e5e5cdbfe3df8f4894e416e4c5926e4 (diff) | |
| parent | b6a7d88397c95a9f3a462274a890b65faafd4d7a (diff) | |
| download | podman-79d05b99cfee2f7841c0568fbe4def4fbc095c5c.tar.gz podman-79d05b99cfee2f7841c0568fbe4def4fbc095c5c.tar.bz2 podman-79d05b99cfee2f7841c0568fbe4def4fbc095c5c.zip | |
Merge pull request #4220 from mheon/null_runtime
Move OCI runtime implementation behind an interface
Diffstat (limited to 'pkg/adapter/terminal_linux.go')
| -rw-r--r-- | pkg/adapter/terminal_linux.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/adapter/terminal_linux.go b/pkg/adapter/terminal_linux.go index 26cfd7b5e..16e552802 100644 --- a/pkg/adapter/terminal_linux.go +++ b/pkg/adapter/terminal_linux.go @@ -13,7 +13,7 @@ import ( ) // ExecAttachCtr execs and attaches to a container -func ExecAttachCtr(ctx context.Context, ctr *libpod.Container, tty, privileged bool, env, cmd []string, user, workDir string, streams *libpod.AttachStreams, preserveFDs int, detachKeys string) (int, error) { +func ExecAttachCtr(ctx context.Context, ctr *libpod.Container, tty, privileged bool, env map[string]string, cmd []string, user, workDir string, streams *libpod.AttachStreams, preserveFDs uint, detachKeys string) (int, error) { resize := make(chan remotecommand.TerminalSize) haveTerminal := terminal.IsTerminal(int(os.Stdin.Fd())) |