Skip to content

Commit 0865fcc

Browse files
authored
Merge pull request #5320 from crazy-max/v0.16.0-picks2
[v0.16] cherry-picks for v0.16.0
2 parents c9d08dd + 74116a2 commit 0865fcc

File tree

6 files changed

+16
-14
lines changed

6 files changed

+16
-14
lines changed

.github/labeler.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ area/worker:
157157

158158
# area:windows
159159
area/windows:
160-
- changed-files:
161-
- any-glob-to-any-file: "**/*_windows.go"
162-
- all-globs-to-all-files: "!vendor/**/*_windows.go"
160+
- all:
161+
- changed-files:
162+
- any-glob-to-any-file: "**/*_windows.go"
163+
- all-globs-to-all-files: "!vendor/**/*_windows.go"

go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ require (
3131
github.com/containernetworking/plugins v1.4.0
3232
github.com/coreos/go-systemd/v22 v22.5.0
3333
github.com/distribution/reference v0.6.0
34-
github.com/docker/cli v27.2.0+incompatible
35-
github.com/docker/docker v27.2.0+incompatible
34+
github.com/docker/cli v27.2.1+incompatible
35+
github.com/docker/docker v27.2.1+incompatible
3636
github.com/docker/go-connections v0.5.0
3737
github.com/docker/go-units v0.5.0
3838
github.com/gofrs/flock v0.12.1

go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,10 @@ github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5Qvfr
141141
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
142142
github.com/dnaeon/go-vcr v1.1.0 h1:ReYa/UBrRyQdant9B4fNHGoCNKw6qh6P0fsdGmZpR7c=
143143
github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko=
144-
github.com/docker/cli v27.2.0+incompatible h1:yHD1QEB1/0vr5eBNpu8tncu8gWxg8EydFPOSKHzXSMM=
145-
github.com/docker/cli v27.2.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
146-
github.com/docker/docker v27.2.0+incompatible h1:Rk9nIVdfH3+Vz4cyI/uhbINhEZ/oLmc+CBXmH6fbNk4=
147-
github.com/docker/docker v27.2.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
144+
github.com/docker/cli v27.2.1+incompatible h1:U5BPtiD0viUzjGAjV1p0MGB8eVA3L3cbIrnyWmSJI70=
145+
github.com/docker/cli v27.2.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
146+
github.com/docker/docker v27.2.1+incompatible h1:fQdiLfW7VLscyoeYEBz7/J8soYFDZV1u6VW6gJEjNMI=
147+
github.com/docker/docker v27.2.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
148148
github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo=
149149
github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
150150
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=

vendor/github.com/docker/docker/api/swagger.yaml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/docker/docker/api/types/container/hostconfig.go

+3-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -447,14 +447,14 @@ github.com/dimchansky/utfbom
447447
# github.com/distribution/reference v0.6.0
448448
## explicit; go 1.20
449449
github.com/distribution/reference
450-
# github.com/docker/cli v27.2.0+incompatible
450+
# github.com/docker/cli v27.2.1+incompatible
451451
## explicit
452452
github.com/docker/cli/cli/config
453453
github.com/docker/cli/cli/config/configfile
454454
github.com/docker/cli/cli/config/credentials
455455
github.com/docker/cli/cli/config/types
456456
github.com/docker/cli/cli/connhelper/commandconn
457-
# github.com/docker/docker v27.2.0+incompatible
457+
# github.com/docker/docker v27.2.1+incompatible
458458
## explicit
459459
github.com/docker/docker/api
460460
github.com/docker/docker/api/types

0 commit comments

Comments
 (0)