Skip to content

Commit 3b49deb

Browse files
thaJeztahthaJeztah
authored
Merge pull request #5711 from thaJeztah/bump_engine_step1
vendor: github.com/docker/docker a72026acbbdf (master, v28.0.0-dev)
2 parents 1a9d191 + c8c47b1 commit 3b49deb

19 files changed

+8
-416
lines changed

‎.golangci.yml

+2
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ linters-settings:
5959
desc: Use github.com/moby/sys/userns instead.
6060
- pkg: "github.com/containerd/containerd/platforms"
6161
desc: The containerd platforms package was migrated to a separate module. Use github.com/containerd/platforms instead.
62+
- pkg: "github.com/docker/docker/pkg/system"
63+
desc: This package should not be used unless strictly necessary.
6264
- pkg: "io/ioutil"
6365
desc: The io/ioutil package has been deprecated, see https://go.dev/doc/go1.16#ioutil
6466
gocyclo:

‎vendor.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
github.com/distribution/reference v0.6.0
1414
github.com/docker/cli-docs-tool v0.8.0
1515
github.com/docker/distribution v2.8.3+incompatible
16-
github.com/docker/docker v27.0.2-0.20241220121230-ad6929339acd+incompatible // master (v-next)
16+
github.com/docker/docker v27.0.2-0.20241223115700-a72026acbbdf+incompatible // master (v-next)
1717
github.com/docker/docker-credential-helpers v0.8.2
1818
github.com/docker/go-connections v0.5.0
1919
github.com/docker/go-units v0.5.0

‎vendor.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ github.com/docker/cli-docs-tool v0.8.0/go.mod h1:8TQQ3E7mOXoYUs811LiPdUnAhXrcVsB
5151
github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
5252
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
5353
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
54-
github.com/docker/docker v27.0.2-0.20241220121230-ad6929339acd+incompatible h1:sQ4Qsqxsm87Q30YfleVm/Sb/Glf9VoQn+5g6Vl5XLXo=
55-
github.com/docker/docker v27.0.2-0.20241220121230-ad6929339acd+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
54+
github.com/docker/docker v27.0.2-0.20241223115700-a72026acbbdf+incompatible h1:FOlr2DkAdfOdGc3O8YjP27v2XzFGIrYmwtORXMbbxJI=
55+
github.com/docker/docker v27.0.2-0.20241223115700-a72026acbbdf+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
5656
github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo=
5757
github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
5858
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0=

‎vendor/github.com/docker/docker/pkg/idtools/idtools_windows.go

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

‎vendor/github.com/docker/docker/pkg/system/args_windows.go

-16
This file was deleted.

‎vendor/github.com/docker/docker/pkg/system/chtimes.go

-48
This file was deleted.

‎vendor/github.com/docker/docker/pkg/system/chtimes_nowindows.go

-14
This file was deleted.

‎vendor/github.com/docker/docker/pkg/system/chtimes_windows.go

-25
This file was deleted.

‎vendor/github.com/docker/docker/pkg/system/errors.go

-6
This file was deleted.

‎vendor/github.com/docker/docker/pkg/system/filesys.go

-19
This file was deleted.

‎vendor/github.com/docker/docker/pkg/system/filesys_unix.go

-16
This file was deleted.

‎vendor/github.com/docker/docker/pkg/system/filesys_windows.go

-135
This file was deleted.

‎vendor/github.com/docker/docker/pkg/system/init_windows.go

-16
This file was deleted.

‎vendor/github.com/docker/docker/pkg/system/utimes_unix.go

-24
This file was deleted.

‎vendor/github.com/docker/docker/pkg/system/utimes_unsupported.go

-10
This file was deleted.

0 commit comments

Comments
 (0)