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

Commit c379ab2

Browse files
authored
Merge pull request #334 from thaJeztah/19.03_backport_switch_creack_pty
[19.03 backport] switch kr/pty to creack/pty v1.1.7 Upstream-commit: 7cb08ca538338c35106f6933eca5e6055c176c70 Component: engine
2 parents d872884 + a8150a5 commit c379ab2

41 files changed

Lines changed: 247 additions & 16 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

components/engine/NOTICE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Copyright 2012-2017 Docker, Inc.
33

44
This product includes software developed at Docker, Inc. (https://www.docker.com).
55

6-
This product contains software (https://github.com/kr/pty) developed
6+
This product contains software (https://github.com/creack/pty) developed
77
by Keith Rarick, licensed under the MIT License.
88

99
The following is courtesy of our legal counsel:

components/engine/integration-cli/docker_cli_attach_unix_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"strings"
1010
"time"
1111

12+
"github.com/creack/pty"
1213
"github.com/go-check/check"
13-
"github.com/kr/pty"
1414
"gotest.tools/assert"
1515
)
1616

components/engine/integration-cli/docker_cli_daemon_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"time"
2525

2626
"github.com/cloudflare/cfssl/helpers"
27+
"github.com/creack/pty"
2728
"github.com/docker/docker/api/types"
2829
moby_daemon "github.com/docker/docker/daemon"
2930
"github.com/docker/docker/integration-cli/checker"
@@ -37,7 +38,6 @@ import (
3738
"github.com/docker/libnetwork/iptables"
3839
"github.com/docker/libtrust"
3940
"github.com/go-check/check"
40-
"github.com/kr/pty"
4141
"golang.org/x/sys/unix"
4242
"gotest.tools/assert"
4343
"gotest.tools/icmd"

components/engine/integration-cli/docker_cli_events_unix_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import (
1313
"time"
1414
"unicode"
1515

16+
"github.com/creack/pty"
1617
"github.com/docker/docker/integration-cli/cli/build"
1718
"github.com/go-check/check"
18-
"github.com/kr/pty"
1919
"golang.org/x/sys/unix"
2020
"gotest.tools/assert"
2121
)

components/engine/integration-cli/docker_cli_exec_unix_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"strings"
1010
"time"
1111

12+
"github.com/creack/pty"
1213
"github.com/go-check/check"
13-
"github.com/kr/pty"
1414
"gotest.tools/assert"
1515
)
1616

components/engine/integration-cli/docker_cli_run_unix_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
"syscall"
1818
"time"
1919

20+
"github.com/creack/pty"
2021
"github.com/docker/docker/client"
2122
"github.com/docker/docker/integration-cli/checker"
2223
"github.com/docker/docker/integration-cli/cli"
@@ -26,7 +27,6 @@ import (
2627
"github.com/docker/docker/pkg/parsers"
2728
"github.com/docker/docker/pkg/sysinfo"
2829
"github.com/go-check/check"
29-
"github.com/kr/pty"
3030
"gotest.tools/assert"
3131
"gotest.tools/icmd"
3232
)

components/engine/integration-cli/docker_cli_save_load_unix_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111
"strings"
1212
"time"
1313

14+
"github.com/creack/pty"
1415
"github.com/docker/docker/integration-cli/cli/build"
1516
"github.com/go-check/check"
16-
"github.com/kr/pty"
1717
"gotest.tools/assert"
1818
"gotest.tools/icmd"
1919
)

components/engine/integration-cli/docker_cli_update_unix_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ import (
1010
"strings"
1111
"time"
1212

13+
"github.com/creack/pty"
1314
"github.com/docker/docker/api/types"
1415
"github.com/docker/docker/client"
1516
"github.com/docker/docker/internal/test/request"
1617
"github.com/docker/docker/pkg/parsers/kernel"
1718
"github.com/go-check/check"
18-
"github.com/kr/pty"
1919
"gotest.tools/assert"
2020
)
2121

components/engine/vendor.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ github.com/google/uuid 0cd6bf5da1e1c83f8b45653022c7
88
github.com/gorilla/mux a7962380ca08b5a188038c69871b8d3fbdf31e89 # v1.7.0
99
github.com/Microsoft/opengcs a10967154e143a36014584a6f664344e3bb0aa64
1010

11+
github.com/creack/pty 2769f65a3a94eb8f876f44a0459d24ae7ad2e488 # v1.1.7
1112
github.com/konsorten/go-windows-terminal-sequences f55edac94c9bbba5d6182a4be46d86a2c9b5b50e # v1.0.2
12-
github.com/kr/pty 521317be5ebc228a0f0ede099fa2a0b5ece22e49 # v1.1.4
1313
github.com/mattn/go-shellwords a72fbe27a1b0ed0df2f02754945044ce1456608b # v1.0.5
1414
github.com/sirupsen/logrus 8bdbc7bcc01dcbb8ec23dc8a28e332258d25251f # v1.4.1
1515
github.com/tchap/go-patricia a7f0089c6f496e8e70402f61733606daa326cac5 # v2.3.0
File renamed without changes.

0 commit comments

Comments
 (0)