Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

Revert tty changes #70

Merged
merged 2 commits into from
Jun 13, 2017
Merged

Conversation

tiborvass
Copy link
Contributor

Cherry-picking moby/moby#33577 to both engine and cli.

This reverts to a version of runc without the ONCLR cleared to not cause
a regression with different clients using --tty.

This also reverts the OPOST changes to the term package to support the
initial change.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit a5e8383)
Signed-off-by: Tibor Vass <tibor@docker.com>
This reverts to a version of runc without the ONCLR cleared to not cause
a regression with different clients using --tty.

This also reverts the OPOST changes to the term package to support the
initial change.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit a5e8383)
Signed-off-by: Tibor Vass <tibor@docker.com>
@andrewhsu andrewhsu mentioned this pull request Jun 12, 2017
40 tasks
@andrewhsu
Copy link
Contributor

Confirmed removing saneTerminal call from docker/runc:
docker-archive/runc@992a5be...2d41c04

And pulling in the changes that we missed out in our first attempt at the revert: #54

@andrewhsu
Copy link
Contributor

LGTM

Tested with a darwin build pointed to an older version of a daemon and stuff works:

$ build/docker-darwin-amd64 version
Client:
 Version:      17.06.0-ce-rc2
 API version:  1.29 (downgraded from 1.30)
 Go version:   go1.8.3
 Git commit:   
 Built:        Tue Jun 13 03:24:16 2017
 OS/Arch:      darwin/amd64

Server:
 Version:      17.05.0-ce
 API version:  1.29 (minimum version 1.12)
 Go version:   go1.7.5
 Git commit:   89658be
 Built:        Thu May  4 21:43:09 2017
 OS/Arch:      linux/amd64
 Experimental: true
$ build/docker-darwin-amd64 run --rm -it alpine ls
bin    etc    lib    mnt    root   sbin   sys    usr
dev    home   media  proc   run    srv    tmp    var

@andrewhsu andrewhsu merged commit 56ecfab into docker-archive:17.06 Jun 13, 2017
@andrewhsu andrewhsu modified the milestone: 17.06.0 Jul 12, 2017
docker-jenkins pushed a commit that referenced this pull request Dec 12, 2017
Pass VERSION to engine static builds
Upstream-commit: 453d9a2
Component: packaging
docker-jenkins pushed a commit that referenced this pull request Oct 11, 2018
[18.09] backport fix denial of service with large numbers in cpuset-cpus and cpuset-mems
Upstream-commit: 4b8336f7cf091fd5c4742286bda1e34c45667d78
Component: engine
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 30, 2020
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Feb 3, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants