Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

container_exec: Fix terminal setting for exec #1443

Merged
merged 1 commit into from Mar 11, 2018

Conversation

mrunalp
Copy link
Member

@mrunalp mrunalp commented Mar 9, 2018

We were incorrectly inheriting tty true from main container.

@runcom @rhatdan PTAL

Closes #1433

Signed-off-by: Mrunal Patel mrunalp@gmail.com

We were incorrectly inheriting tty true from main container.

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
@mrunalp mrunalp requested a review from runcom as a code owner March 9, 2018 19:27
@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. cncf-cla: yes labels Mar 9, 2018
@@ -766,6 +766,9 @@ func PrepareProcessExec(c *Container, cmd []string, tty bool) (*os.File, error)

pspec := c.Spec().Process
pspec.Args = cmd
// We need to default this to false else it will inherit terminal as true
// from the container.
pspec.Terminal = false
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mmm that's why we changed it in the first place to inherit, do we always want this to be false?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can let the caller decide if they want to inherit and pass it down explicity as true.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alrighty, figured, thanks!

@runcom
Copy link
Member

runcom commented Mar 9, 2018

LGTM, just a question

@rhatdan
Copy link
Contributor

rhatdan commented Mar 9, 2018

LGTM

@rhatdan
Copy link
Contributor

rhatdan commented Mar 9, 2018

/test all

@mrunalp
Copy link
Member Author

mrunalp commented Mar 10, 2018

/test e2e_fedora

2 similar comments
@runcom
Copy link
Member

runcom commented Mar 10, 2018

/test e2e_fedora

@runcom
Copy link
Member

runcom commented Mar 10, 2018

/test e2e_fedora

@mrunalp
Copy link
Member Author

mrunalp commented Mar 10, 2018

@rhatdan @runcom ready to merge.

@runcom runcom merged commit dc78b18 into cri-o:release-1.9 Mar 11, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants