Skip to content

Commit 097fb7e

Browse files
dependabot[bot]pendo324subashkotha
authored
build(deps): Bump github.com/docker/docker from 28.0.2+incompatible to 28.2.2+incompatible (runfinch#251)
* build(deps): Bump github.com/docker/docker Bumps [github.com/docker/docker](https://github.com/docker/docker) from 28.0.2+incompatible to 28.2.2+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](moby/moby@v28.0.2...v28.2.2) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-version: 28.2.2+incompatible dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * remove usage of deprecated features Signed-off-by: Justin Alvarez <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Justin Alvarez <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Justin Alvarez <[email protected]> Co-authored-by: Subash Kotha <[email protected]>
1 parent cc74c20 commit 097fb7e

File tree

6 files changed

+22
-16
lines changed

6 files changed

+22
-16
lines changed

‎go.mod‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,17 @@ require (
1717
github.com/coreos/go-systemd/v22 v22.5.0
1818
github.com/distribution/reference v0.6.0
1919
github.com/docker/cli v28.2.2+incompatible
20-
github.com/docker/docker v28.0.2+incompatible
20+
github.com/docker/docker v28.2.2+incompatible
2121
github.com/docker/go-connections v0.5.0
2222
github.com/docker/go-units v0.5.0
2323
github.com/getlantern/httptest v0.0.0-20161025015934-4b40f4c7e590
2424
github.com/gofrs/flock v0.12.1
2525
github.com/golang/mock v1.6.0
2626
github.com/gorilla/handlers v1.5.2
2727
github.com/gorilla/mux v1.8.1
28+
github.com/moby/go-archive v0.1.0
2829
github.com/moby/moby v28.1.1+incompatible
30+
github.com/moby/sys/user v0.4.0
2931
github.com/onsi/ginkgo/v2 v2.23.4
3032
github.com/onsi/gomega v1.37.0
3133
github.com/opencontainers/go-digest v1.0.0
@@ -98,12 +100,12 @@ require (
98100
github.com/moby/docker-image-spec v1.3.1 // indirect
99101
github.com/moby/locker v1.0.1 // indirect
100102
github.com/moby/patternmatcher v0.6.0 // indirect
103+
github.com/moby/sys/atomicwriter v0.1.0 // indirect
101104
github.com/moby/sys/mount v0.3.4 // indirect
102105
github.com/moby/sys/mountinfo v0.7.2 // indirect
103106
github.com/moby/sys/sequential v0.6.0 // indirect
104107
github.com/moby/sys/signal v0.7.1 // indirect
105108
github.com/moby/sys/symlink v0.3.0 // indirect
106-
github.com/moby/sys/user v0.3.0 // indirect
107109
github.com/moby/sys/userns v0.1.0 // indirect
108110
github.com/moby/term v0.5.2 // indirect
109111
github.com/morikuni/aec v1.0.0 // indirect

‎go.sum‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ github.com/djherbis/times v1.6.0 h1:w2ctJ92J8fBvWPxugmXIv7Nz7Q3iDMKNx9v5ocVH20c=
9292
github.com/djherbis/times v1.6.0/go.mod h1:gOHeRAz2h+VJNZ5Gmc/o7iD9k4wW7NMVqieYCY99oc0=
9393
github.com/docker/cli v28.2.2+incompatible h1:qzx5BNUDFqlvyq4AHzdNB7gSyVTmU4cgsyN9SdInc1A=
9494
github.com/docker/cli v28.2.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
95-
github.com/docker/docker v28.0.2+incompatible h1:9BILleFwug5FSSqWBgVevgL3ewDJfWWWyZVqlDMttE8=
96-
github.com/docker/docker v28.0.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
95+
github.com/docker/docker v28.2.2+incompatible h1:CjwRSksz8Yo4+RmQ339Dp/D2tGO5JxwYeqtMOEe0LDw=
96+
github.com/docker/docker v28.2.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
9797
github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo=
9898
github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
9999
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
@@ -204,12 +204,16 @@ github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG
204204
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
205205
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
206206
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
207+
github.com/moby/go-archive v0.1.0 h1:Kk/5rdW/g+H8NHdJW2gsXyZ7UnzvJNOy6VKJqueWdcQ=
208+
github.com/moby/go-archive v0.1.0/go.mod h1:G9B+YoujNohJmrIYFBpSd54GTUB4lt9S+xVQvsJyFuo=
207209
github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg=
208210
github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
209211
github.com/moby/moby v28.1.1+incompatible h1:lyEaGTiUhIdXRUv/vPamckAbPt5LcPQkeHmwAHN98eQ=
210212
github.com/moby/moby v28.1.1+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc=
211213
github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
212214
github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
215+
github.com/moby/sys/atomicwriter v0.1.0 h1:kw5D/EqkBwsBFi0ss9v1VG3wIkVhzGvLklJ+w3A14Sw=
216+
github.com/moby/sys/atomicwriter v0.1.0/go.mod h1:Ul8oqv2ZMNHOceF643P6FKPXeCmYtlQMvpizfsSoaWs=
213217
github.com/moby/sys/mount v0.3.4 h1:yn5jq4STPztkkzSKpZkLcmjue+bZJ0u2AuQY1iNI1Ww=
214218
github.com/moby/sys/mount v0.3.4/go.mod h1:KcQJMbQdJHPlq5lcYT+/CjatWM4PuxKe+XLSVS4J6Os=
215219
github.com/moby/sys/mountinfo v0.7.2 h1:1shs6aH5s4o5H2zQLn796ADW1wMrIwHsyJ2v9KouLrg=
@@ -220,8 +224,8 @@ github.com/moby/sys/signal v0.7.1 h1:PrQxdvxcGijdo6UXXo/lU/TvHUWyPhj7UOpSo8tuvk0
220224
github.com/moby/sys/signal v0.7.1/go.mod h1:Se1VGehYokAkrSQwL4tDzHvETwUZlnY7S5XtQ50mQp8=
221225
github.com/moby/sys/symlink v0.3.0 h1:GZX89mEZ9u53f97npBy4Rc3vJKj7JBDj/PN2I22GrNU=
222226
github.com/moby/sys/symlink v0.3.0/go.mod h1:3eNdhduHmYPcgsJtZXW1W4XUJdZGBIkttZ8xKqPUJq0=
223-
github.com/moby/sys/user v0.3.0 h1:9ni5DlcW5an3SvRSx4MouotOygvzaXbaSrc/wGDFWPo=
224-
github.com/moby/sys/user v0.3.0/go.mod h1:bG+tYYYJgaMtRKgEmuueC0hJEAZWwtIbZTB+85uoHjs=
227+
github.com/moby/sys/user v0.4.0 h1:jhcMKit7SA80hivmFJcbB1vqmw//wU61Zdui2eQXuMs=
228+
github.com/moby/sys/user v0.4.0/go.mod h1:bG+tYYYJgaMtRKgEmuueC0hJEAZWwtIbZTB+85uoHjs=
225229
github.com/moby/sys/userns v0.1.0 h1:tVLXkFOxVu9A64/yh59slHVv9ahO9UIev4JZusOLG/g=
226230
github.com/moby/sys/userns v0.1.0/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcYfDHOl28=
227231
github.com/moby/term v0.5.2 h1:6qk3FJAFDs6i/q3W/pQ97SX192qKfZgGjCQqfCJkgzQ=

‎internal/service/container/put_archive.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313

1414
containerd "github.com/containerd/containerd/v2/client"
1515
cerrdefs "github.com/containerd/errdefs"
16-
"github.com/docker/docker/pkg/archive"
17-
"github.com/docker/docker/pkg/idtools"
16+
"github.com/moby/go-archive"
17+
"github.com/moby/sys/user"
1818

1919
"github.com/runfinch/finch-daemon/api/types"
2020
"github.com/runfinch/finch-daemon/pkg/errdefs"
@@ -98,7 +98,7 @@ func (s *service) ExtractArchiveInContainer(ctx context.Context, opts *types.Put
9898
}
9999
tarOptions := &archive.TarOptions{
100100
NoOverwriteDirNonDir: opts.Overwrite,
101-
IDMap: idtools.IdentityMapping{},
101+
IDMap: user.IdentityMapping{},
102102
}
103103
return s.tarExtractor.ExtractCompressed(body, filePath, tarOptions)
104104
}

‎internal/service/container/put_archive_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import (
1616
"github.com/containerd/containerd/v2/core/containers"
1717
"github.com/containerd/containerd/v2/core/mount"
1818
cerrdefs "github.com/containerd/errdefs"
19-
"github.com/docker/docker/pkg/archive"
20-
"github.com/docker/docker/pkg/idtools"
2119
"github.com/golang/mock/gomock"
20+
"github.com/moby/go-archive"
21+
"github.com/moby/sys/user"
2222
. "github.com/onsi/ginkgo/v2"
2323
. "github.com/onsi/gomega"
2424
"github.com/opencontainers/runtime-spec/specs-go"
@@ -117,7 +117,7 @@ var _ = Describe("Extract in container API", func() {
117117
task.EXPECT().Pid().Return(mockPid)
118118
tarExtractor.EXPECT().ExtractCompressed(mockReader, containerPath, &archive.TarOptions{
119119
NoOverwriteDirNonDir: false,
120-
IDMap: idtools.IdentityMapping{},
120+
IDMap: user.IdentityMapping{},
121121
}).Return(nil)
122122
err = s.ExtractArchiveInContainer(ctx, putArchiveOpts, mockReader)
123123
Expect(err).Should(BeNil())
@@ -239,7 +239,7 @@ var _ = Describe("Extract in container API", func() {
239239
})
240240
tarExtractor.EXPECT().ExtractCompressed(mockReader, gomock.Any(), &archive.TarOptions{
241241
NoOverwriteDirNonDir: false,
242-
IDMap: idtools.IdentityMapping{},
242+
IDMap: user.IdentityMapping{},
243243
}).Return(nil)
244244
cdClient.EXPECT().Unmount(gomock.Any(), 0)
245245
err = s.ExtractArchiveInContainer(ctx, putArchiveOpts, mockReader)
@@ -284,7 +284,7 @@ var _ = Describe("Extract in container API", func() {
284284
})
285285
tarExtractor.EXPECT().ExtractCompressed(mockReader, gomock.Any(), &archive.TarOptions{
286286
NoOverwriteDirNonDir: false,
287-
IDMap: idtools.IdentityMapping{},
287+
IDMap: user.IdentityMapping{},
288288
}).Return(nil)
289289
cdClient.EXPECT().Unmount(gomock.Any(), 0)
290290
logger.EXPECT().Errorf(gomock.Any(), gomock.Any(), gomock.Any())

‎mocks/mocks_archive/tarextractor.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/archive/archive.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"path"
1010

1111
"github.com/containerd/nerdctl/v2/pkg/tarutil"
12-
"github.com/docker/docker/pkg/archive"
12+
"github.com/moby/go-archive"
1313

1414
"github.com/runfinch/finch-daemon/pkg/ecc"
1515
"github.com/runfinch/finch-daemon/pkg/flog"

0 commit comments

Comments
 (0)