Browse code
Revert ONCLR and OPOST changes
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>
Michael Crosby authored on 2017/06/08 03:29:33Showing 6 changed files
- hack/dockerfile/binaries-commits
- hack/dockerfile/install-binaries.sh
- integration-cli/docker_cli_service_logs_test.go
- pkg/term/termios_bsd.go
- pkg/term/termios_linux.go
- vendor.conf
| ... | ... |
@@ -3,7 +3,7 @@ |
| 3 | 3 |
TOMLV_COMMIT=9baf8a8a9f2ed20a8e54160840c492f937eeaf9a |
| 4 | 4 |
|
| 5 | 5 |
# When updating RUNC_COMMIT, also update runc in vendor.conf accordingly |
| 6 |
-RUNC_COMMIT=992a5be178a62e026f4069f443c6164912adbf09 |
|
| 6 |
+RUNC_COMMIT=2d41c047c83e09a6d61d464906feb2a2f3c52aa4 |
|
| 7 | 7 |
CONTAINERD_COMMIT=3addd840653146c90a254301d6c3a663c7fd6429 |
| 8 | 8 |
TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574 |
| 9 | 9 |
LIBNETWORK_COMMIT=7b2b1feb1de4817d522cc372af149ff48d25028e |
| ... | ... |
@@ -20,7 +20,7 @@ RUNC_BUILDTAGS="${RUNC_BUILDTAGS:-"seccomp apparmor selinux"}"
|
| 20 | 20 |
|
| 21 | 21 |
install_runc() {
|
| 22 | 22 |
echo "Install runc version $RUNC_COMMIT" |
| 23 |
- git clone https://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" |
|
| 23 |
+ git clone https://github.com/docker/runc.git "$GOPATH/src/github.com/opencontainers/runc" |
|
| 24 | 24 |
cd "$GOPATH/src/github.com/opencontainers/runc" |
| 25 | 25 |
git checkout -q "$RUNC_COMMIT" |
| 26 | 26 |
make BUILDTAGS="$RUNC_BUILDTAGS" $1 |
| ... | ... |
@@ -287,7 +287,7 @@ func (s *DockerSwarmSuite) TestServiceLogsTTY(c *check.C) {
|
| 287 | 287 |
result = icmd.RunCmd(cmd) |
| 288 | 288 |
// for some reason there is carriage return in the output. i think this is |
| 289 | 289 |
// just expected. |
| 290 |
- c.Assert(result, icmd.Matches, icmd.Expected{Out: "out\nerr\n"})
|
|
| 290 |
+ c.Assert(result, icmd.Matches, icmd.Expected{Out: "out\r\nerr\r\n"})
|
|
| 291 | 291 |
} |
| 292 | 292 |
|
| 293 | 293 |
func (s *DockerSwarmSuite) TestServiceLogsNoHangDeletedContainer(c *check.C) {
|
| ... | ... |
@@ -27,7 +27,7 @@ func MakeRaw(fd uintptr) (*State, error) {
|
| 27 | 27 |
|
| 28 | 28 |
newState := oldState.termios |
| 29 | 29 |
newState.Iflag &^= (unix.IGNBRK | unix.BRKINT | unix.PARMRK | unix.ISTRIP | unix.INLCR | unix.IGNCR | unix.ICRNL | unix.IXON) |
| 30 |
- newState.Oflag |= unix.OPOST |
|
| 30 |
+ newState.Oflag &^= unix.OPOST |
|
| 31 | 31 |
newState.Lflag &^= (unix.ECHO | unix.ECHONL | unix.ICANON | unix.ISIG | unix.IEXTEN) |
| 32 | 32 |
newState.Cflag &^= (unix.CSIZE | unix.PARENB) |
| 33 | 33 |
newState.Cflag |= unix.CS8 |
| ... | ... |
@@ -26,7 +26,7 @@ func MakeRaw(fd uintptr) (*State, error) {
|
| 26 | 26 |
newState := oldState.termios |
| 27 | 27 |
|
| 28 | 28 |
newState.Iflag &^= (unix.IGNBRK | unix.BRKINT | unix.PARMRK | unix.ISTRIP | unix.INLCR | unix.IGNCR | unix.ICRNL | unix.IXON) |
| 29 |
- newState.Oflag |= unix.OPOST |
|
| 29 |
+ newState.Oflag &^= unix.OPOST |
|
| 30 | 30 |
newState.Lflag &^= (unix.ECHO | unix.ECHONL | unix.ICANON | unix.ISIG | unix.IEXTEN) |
| 31 | 31 |
newState.Cflag &^= (unix.CSIZE | unix.PARENB) |
| 32 | 32 |
newState.Cflag |= unix.CS8 |
| ... | ... |
@@ -61,7 +61,7 @@ google.golang.org/grpc v1.0.4 |
| 61 | 61 |
github.com/miekg/pkcs11 df8ae6ca730422dba20c768ff38ef7d79077a59f |
| 62 | 62 |
|
| 63 | 63 |
# When updating, also update RUNC_COMMIT in hack/dockerfile/binaries-commits accordingly |
| 64 |
-github.com/opencontainers/runc 992a5be178a62e026f4069f443c6164912adbf09 |
|
| 64 |
+github.com/opencontainers/runc 2d41c047c83e09a6d61d464906feb2a2f3c52aa4 https://github.com/docker/runc |
|
| 65 | 65 |
github.com/opencontainers/image-spec f03dbe35d449c54915d235f1a3cf8f585a24babe |
| 66 | 66 |
github.com/opencontainers/runtime-spec d42f1eb741e6361e858d83fc75aa6893b66292c4 # specs |
| 67 | 67 |
|