Skip to content

Commit 557afb6

Browse files
thaJeztahthaJeztah
authored
Merge pull request #5728 from thaJeztah/vendor_engine
vendor: github.com/docker/docker 50212d215ba7 (master, v28.0-dev)
2 parents 667ece3 + 216674c commit 557afb6

18 files changed

Lines changed: 222 additions & 474 deletions

File tree

‎cli/context/store/metadatastore.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"sort"
1313

1414
"github.com/docker/docker/errdefs"
15-
"github.com/docker/docker/pkg/ioutils"
15+
"github.com/docker/docker/pkg/atomicwriter"
1616
"github.com/fvbommel/sortorder"
1717
"github.com/pkg/errors"
1818
)
@@ -40,7 +40,7 @@ func (s *metadataStore) createOrUpdate(meta Metadata) error {
4040
if err != nil {
4141
return err
4242
}
43-
return ioutils.AtomicWriteFile(filepath.Join(contextDir, metaFile), bytes, 0o644)
43+
return atomicwriter.WriteFile(filepath.Join(contextDir, metaFile), bytes, 0o644)
4444
}
4545

4646
func parseTypedOrMap(payload []byte, getter TypeGetter) (any, error) {

‎cli/context/store/tlsstore.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"path/filepath"
66

77
"github.com/docker/docker/errdefs"
8-
"github.com/docker/docker/pkg/ioutils"
8+
"github.com/docker/docker/pkg/atomicwriter"
99
"github.com/pkg/errors"
1010
)
1111

@@ -32,7 +32,7 @@ func (s *tlsStore) createOrUpdate(name, endpointName, filename string, data []by
3232
if err := os.MkdirAll(endpointDir, 0o700); err != nil {
3333
return err
3434
}
35-
return ioutils.AtomicWriteFile(filepath.Join(endpointDir, filename), data, 0o600)
35+
return atomicwriter.WriteFile(filepath.Join(endpointDir, filename), data, 0o600)
3636
}
3737

3838
func (s *tlsStore) getData(name, endpointName, filename string) ([]byte, error) {

‎vendor.mod‎

Lines changed: 2 additions & 2 deletions
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.20250101151200-6f6c3b921180+incompatible // master (v-next)
16+
github.com/docker/docker v27.0.2-0.20250108165300-50212d215ba7+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
@@ -25,7 +25,7 @@ require (
2525
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
2626
github.com/mattn/go-runewidth v0.0.15
2727
github.com/moby/patternmatcher v0.6.0
28-
github.com/moby/swarmkit/v2 v2.0.0-20241017191044-e8ecf83ee08e
28+
github.com/moby/swarmkit/v2 v2.0.0-20250103191802-8c1959736554
2929
github.com/moby/sys/capability v0.4.0
3030
github.com/moby/sys/sequential v0.6.0
3131
github.com/moby/sys/signal v0.7.1

‎vendor.sum‎

Lines changed: 4 additions & 4 deletions
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.20250101151200-6f6c3b921180+incompatible h1:R8zzddOp6gD0KL9SGDvRtbGiWZ8fxqzzu2v6t+whvdc=
55-
github.com/docker/docker v27.0.2-0.20250101151200-6f6c3b921180+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
54+
github.com/docker/docker v27.0.2-0.20250108165300-50212d215ba7+incompatible h1:d2wmwnGBWKKlr7JBS6SD/1O3DRvZATLQg4tbgk0rzvo=
55+
github.com/docker/docker v27.0.2-0.20250108165300-50212d215ba7+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=
@@ -166,8 +166,8 @@ github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3N
166166
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
167167
github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
168168
github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
169-
github.com/moby/swarmkit/v2 v2.0.0-20241017191044-e8ecf83ee08e h1:1yC8fRqStY6NirU/swI74fsrHvZVMbtxsHcvl8YpzDg=
170-
github.com/moby/swarmkit/v2 v2.0.0-20241017191044-e8ecf83ee08e/go.mod h1:mTTGIAz/59OGZR5Qe+QByIe3Nxc+sSuJkrsStFhr6Lg=
169+
github.com/moby/swarmkit/v2 v2.0.0-20250103191802-8c1959736554 h1:DMHJbgyNZWyrPKYjCYt2IxEO7KA0eSd4fo6KQsv2W84=
170+
github.com/moby/swarmkit/v2 v2.0.0-20250103191802-8c1959736554/go.mod h1:mTTGIAz/59OGZR5Qe+QByIe3Nxc+sSuJkrsStFhr6Lg=
171171
github.com/moby/sys/capability v0.4.0 h1:4D4mI6KlNtWMCM1Z/K0i7RV1FkX+DBDHKVJpCndZoHk=
172172
github.com/moby/sys/capability v0.4.0/go.mod h1:4g9IK291rVkms3LKCDOoYlnV8xKwoDTpIrNEE35Wq0I=
173173
github.com/moby/sys/sequential v0.6.0 h1:qrx7XFUd/5DxtqcoH1h438hF5TmOvzC/lspjy7zgvCU=

‎vendor/github.com/docker/docker/builder/remotecontext/urlutil/urlutil.go‎

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/docker/docker/client/utils.go‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/docker/docker/internal/lazyregexp/lazyregexp.go‎

Lines changed: 90 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/docker/docker/pkg/ioutils/fswriters.go renamed to vendor/github.com/docker/docker/pkg/atomicwriter/atomicwriter.go

Lines changed: 16 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)