Skip to content

Commit c27b007

Browse files
committed
chore: upgrade docker and gin
1 parent 043ce7d commit c27b007

File tree

3 files changed

+593
-51
lines changed

3 files changed

+593
-51
lines changed

container/docker/docker.go

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -288,11 +288,14 @@ func buildListOptions(options string) (apiTypes.ContainerListOptions, error) {
288288
case "-f", "--filter":
289289
if i+1 < len(arg) {
290290
f := args[i+1]
291-
filterArgs, err := filters.ParseFlag(f, filters.NewArgs())
292-
if err != nil {
293-
return listOptions, err
291+
kv := strings.Split(f, "=")
292+
if len(kv) != 2 {
293+
return listOptions, fmt.Errorf("bad filter '%s'", f)
294294
}
295-
listOptions.Filters = filterArgs
295+
if listOptions.Filters.Len() == 0 {
296+
listOptions.Filters = filters.NewArgs()
297+
}
298+
listOptions.Filters.Add(kv[0], kv[1])
296299
}
297300
case "-n", "--last":
298301
if i+1 < len(arg) {
@@ -346,7 +349,10 @@ func (docker *DockerCli) Exec(ctx context.Context, container types.Container) (t
346349
return nil, fmt.Errorf("exec ID empty")
347350
}
348351

349-
resp, err := docker.cli.ContainerExecAttach(ctx, execID, execConfig)
352+
execCheck := apiTypes.ExecStartCheck{
353+
Tty: true,
354+
}
355+
resp, err := docker.cli.ContainerExecAttach(ctx, execID, execCheck)
350356
if err != nil {
351357
return nil, err
352358
}

go.mod

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,21 @@ module github.com/wrfly/container-web-tty
33
go 1.16
44

55
require (
6-
github.com/Microsoft/go-winio v0.4.12 // indirect
7-
github.com/docker/distribution v2.7.1+incompatible // indirect
8-
github.com/docker/docker v1.13.1
6+
github.com/containerd/containerd v1.5.5 // indirect
7+
github.com/docker/docker v20.10.8+incompatible
98
github.com/docker/go-connections v0.4.0 // indirect
10-
github.com/docker/go-units v0.3.3 // indirect
119
github.com/elazarl/goproxy v0.0.0-20181111060418-2ce16c963a8a
12-
github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3 // indirect
13-
github.com/gin-gonic/gin v1.3.0
10+
github.com/gin-gonic/gin v1.7.3
1411
github.com/golang/protobuf v1.5.2
1512
github.com/gorilla/websocket v1.4.2
16-
github.com/imdario/mergo v0.3.7 // indirect
17-
github.com/mattn/go-isatty v0.0.7 // indirect
18-
github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
19-
github.com/sirupsen/logrus v1.4.0
20-
github.com/ugorji/go/codec v0.0.0-20190320090025-2dc34c0b8780 // indirect
13+
github.com/morikuni/aec v1.0.0 // indirect
14+
github.com/sirupsen/logrus v1.8.1
2115
github.com/urfave/cli/v2 v2.3.0
2216
github.com/wrfly/ecp v0.1.1-0.20190725160759-97269b9e95f0
2317
github.com/wrfly/pubsub v0.0.0-20200314104228-47828c5578b6
2418
github.com/yudai/gotty v2.0.0-alpha.3+incompatible
2519
golang.org/x/net v0.0.0-20210520170846-37e1c6afe023
26-
google.golang.org/grpc v1.27.1
27-
gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
28-
gopkg.in/go-playground/validator.v8 v8.18.2 // indirect
20+
google.golang.org/grpc v1.33.2
2921
k8s.io/api v0.22.0
3022
k8s.io/apimachinery v0.22.0
3123
k8s.io/client-go v0.22.0

0 commit comments

Comments
 (0)