Skip to content

Commit 758fca9

Browse files
Fix CVE-2025-54410: Upgrade docker/docker to v28.0.0 (microsoft#617)
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: dlevy-msft-sql <194277063+dlevy-msft-sql@users.noreply.github.com>
1 parent e7dc6a4 commit 758fca9

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/alecthomas/chroma/v2 v2.5.0
99
github.com/billgraziano/dpapi v0.4.0
1010
github.com/docker/distribution v2.8.2+incompatible
11-
github.com/docker/docker v27.3.1+incompatible
11+
github.com/docker/docker v28.0.0+incompatible
1212
github.com/docker/go-connections v0.4.0
1313
github.com/golang-sql/sqlexp v0.1.0
1414
github.com/google/uuid v1.6.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ github.com/dlclark/regexp2 v1.4.0 h1:F1rxgk7p4uKjwIQxBs9oAXe5CqrXlCduYEJvrF4u93E
102102
github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
103103
github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
104104
github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
105-
github.com/docker/docker v27.3.1+incompatible h1:KttF0XoteNTicmUtBO0L2tP+J7FGRFTjaEF4k6WdhfI=
106-
github.com/docker/docker v27.3.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
105+
github.com/docker/docker v28.0.0+incompatible h1:Olh0KS820sJ7nPsBKChVhk5pzqcwDR15fumfAd/p9hM=
106+
github.com/docker/docker v28.0.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
107107
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
108108
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
109109
github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQV8=

internal/container/controller.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"strconv"
1313
"strings"
1414

15-
"github.com/docker/docker/api/types"
1615
"github.com/docker/docker/api/types/container"
1716
"github.com/docker/docker/api/types/filters"
1817
"github.com/docker/docker/api/types/image"
@@ -202,7 +201,7 @@ func (c Controller) ContainerFiles(id string, filespec string) (files []string)
202201
response, err := c.cli.ContainerExecCreate(
203202
context.Background(),
204203
id,
205-
types.ExecConfig{
204+
container.ExecOptions{
206205
AttachStderr: false,
207206
AttachStdout: true,
208207
Cmd: cmd,
@@ -213,7 +212,7 @@ func (c Controller) ContainerFiles(id string, filespec string) (files []string)
213212
r, err := c.cli.ContainerExecAttach(
214213
context.Background(),
215214
response.ID,
216-
types.ExecStartCheck{},
215+
container.ExecStartOptions{},
217216
)
218217
checkErr(err)
219218
defer r.Close()
@@ -269,7 +268,7 @@ func (c Controller) runCmdInContainer(id string, cmd []string) ([]byte, []byte)
269268
response, err := c.cli.ContainerExecCreate(
270269
context.Background(),
271270
id,
272-
types.ExecConfig{
271+
container.ExecOptions{
273272
AttachStderr: true,
274273
AttachStdout: true,
275274
Cmd: cmd,
@@ -280,7 +279,7 @@ func (c Controller) runCmdInContainer(id string, cmd []string) ([]byte, []byte)
280279
r, err := c.cli.ContainerExecAttach(
281280
context.Background(),
282281
response.ID,
283-
types.ExecStartCheck{},
282+
container.ExecStartOptions{},
284283
)
285284
checkErr(err)
286285
defer r.Close()

0 commit comments

Comments
 (0)