Skip to content

Commit 6def2b3

Browse files
IcefeastLadislav Zvada
and
Ladislav Zvada
authored
github.com/docker/docker from v20.10.24 to v24.0.6 (#472)
Co-authored-by: Ladislav Zvada <[email protected]>
1 parent b525360 commit 6def2b3

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

Diff for: go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/alecthomas/chroma/v2 v2.5.0
77
github.com/billgraziano/dpapi v0.4.0
88
github.com/docker/distribution v2.8.2+incompatible
9-
github.com/docker/docker v20.10.24+incompatible
9+
github.com/docker/docker v24.0.6+incompatible
1010
github.com/docker/go-connections v0.4.0
1111
github.com/golang-sql/sqlexp v0.1.0
1212
github.com/google/uuid v1.3.0

Diff for: go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m3
8989
github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
9090
github.com/docker/docker v20.10.24+incompatible h1:Ugvxm7a8+Gz6vqQYQQ2W7GYq5EUPaAiuPgIfVyI3dYE=
9191
github.com/docker/docker v20.10.24+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
92+
github.com/docker/docker v24.0.6+incompatible h1:hceabKCtUgDqPu+qm0NgsaXf28Ljf4/pWFL7xjWWDgE=
93+
github.com/docker/docker v24.0.6+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
9294
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
9395
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
9496
github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQV8=

Diff for: internal/container/controller.go

+6-5
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,18 @@ import (
77
"bufio"
88
"bytes"
99
"context"
10+
"io"
11+
"path/filepath"
12+
"strconv"
13+
"strings"
14+
1015
"github.com/docker/docker/api/types"
1116
"github.com/docker/docker/api/types/container"
1217
"github.com/docker/docker/api/types/filters"
1318
"github.com/docker/docker/client"
1419
"github.com/docker/docker/pkg/stdcopy"
1520
"github.com/docker/go-connections/nat"
1621
specs "github.com/opencontainers/image-spec/specs-go/v1"
17-
"io"
18-
"path/filepath"
19-
"strconv"
20-
"strings"
2122
)
2223

2324
type Controller struct {
@@ -165,7 +166,7 @@ func (c Controller) ContainerStop(id string) (err error) {
165166
panic("Must pass in non-empty id")
166167
}
167168

168-
err = c.cli.ContainerStop(context.Background(), id, nil)
169+
err = c.cli.ContainerStop(context.Background(), id, container.StopOptions{})
169170
return
170171
}
171172

0 commit comments

Comments
 (0)