Skip to content

Commit 8551369

Browse files
committed
Use dedicated moby api package
Signed-off-by: Bob Du <i@bobdu.cc>
1 parent 7471efd commit 8551369

File tree

435 files changed

+8851
-41317
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

435 files changed

+8851
-41317
lines changed

go.mod

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ require (
66
github.com/containerd/stargz-snapshotter/estargz v0.16.3
77
github.com/docker/cli v28.2.2+incompatible
88
github.com/docker/distribution v2.8.3+incompatible
9-
github.com/docker/docker v28.2.2+incompatible
109
github.com/google/go-cmp v0.7.0
1110
github.com/klauspost/compress v1.18.0
1211
github.com/mitchellh/go-homedir v1.1.0
1312
github.com/moby/docker-image-spec v1.3.1
13+
github.com/moby/moby/api v1.52.0
14+
github.com/moby/moby/client v0.1.0
1415
github.com/opencontainers/go-digest v1.0.0
1516
github.com/opencontainers/image-spec v1.1.1
1617
github.com/spf13/cobra v1.9.1
@@ -24,20 +25,15 @@ require (
2425
github.com/Microsoft/go-winio v0.6.2 // indirect
2526
github.com/containerd/errdefs v1.0.0 // indirect
2627
github.com/containerd/errdefs/pkg v0.3.0 // indirect
27-
github.com/containerd/log v0.1.0 // indirect
2828
github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
2929
github.com/distribution/reference v0.6.0 // indirect
3030
github.com/docker/docker-credential-helpers v0.9.3 // indirect
31-
github.com/docker/go-connections v0.5.0 // indirect
31+
github.com/docker/go-connections v0.6.0 // indirect
3232
github.com/docker/go-units v0.5.0 // indirect
3333
github.com/felixge/httpsnoop v1.0.4 // indirect
3434
github.com/go-logr/logr v1.4.3 // indirect
3535
github.com/go-logr/stdr v1.2.2 // indirect
36-
github.com/gogo/protobuf v1.3.2 // indirect
3736
github.com/inconshreveable/mousetrap v1.1.0 // indirect
38-
github.com/moby/sys/atomicwriter v0.1.0 // indirect
39-
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
40-
github.com/morikuni/aec v1.0.0 // indirect
4137
github.com/pkg/errors v0.9.1 // indirect
4238
github.com/russross/blackfriday/v2 v2.1.0 // indirect
4339
github.com/sirupsen/logrus v1.9.3 // indirect
@@ -46,13 +42,9 @@ require (
4642
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
4743
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
4844
go.opentelemetry.io/otel v1.36.0 // indirect
49-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.33.0 // indirect
5045
go.opentelemetry.io/otel/metric v1.36.0 // indirect
5146
go.opentelemetry.io/otel/trace v1.36.0 // indirect
5247
golang.org/x/mod v0.25.0 // indirect
5348
golang.org/x/sys v0.33.0 // indirect
54-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
55-
google.golang.org/protobuf v1.36.3 // indirect
5649
gopkg.in/yaml.v3 v3.0.1 // indirect
57-
gotest.tools/v3 v3.0.3 // indirect
5850
)

go.sum

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

pkg/v1/daemon/image.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"sync"
2222
"time"
2323

24-
api "github.com/docker/docker/api/types/image"
24+
api "github.com/moby/moby/api/types/image"
2525

2626
"github.com/google/go-containerregistry/pkg/name"
2727
v1 "github.com/google/go-containerregistry/pkg/v1"

pkg/v1/daemon/image_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import (
2323
"strings"
2424
"testing"
2525

26-
api "github.com/docker/docker/api/types/image"
27-
"github.com/docker/docker/api/types/storage"
28-
"github.com/docker/docker/client"
2926
specs "github.com/moby/docker-image-spec/specs-go/v1"
27+
api "github.com/moby/moby/api/types/image"
28+
"github.com/moby/moby/api/types/storage"
29+
"github.com/moby/moby/client"
3030

3131
"github.com/google/go-containerregistry/pkg/name"
3232
"github.com/google/go-containerregistry/pkg/v1/compare"

pkg/v1/daemon/options.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818
"context"
1919
"io"
2020

21-
api "github.com/docker/docker/api/types/image"
22-
"github.com/docker/docker/client"
21+
api "github.com/moby/moby/api/types/image"
22+
"github.com/moby/moby/client"
2323
)
2424

2525
// ImageOption is an alias for Option.
@@ -76,7 +76,7 @@ func WithUnbufferedOpener() Option {
7676

7777
// WithClient is a functional option to allow injecting a docker client.
7878
//
79-
// By default, github.com/docker/docker/client.FromEnv is used.
79+
// By default, github.com/moby/moby/client.FromEnv is used.
8080
func WithClient(client Client) Option {
8181
return func(o *options) {
8282
o.client = client

pkg/v1/daemon/write.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ import (
1818
"fmt"
1919
"io"
2020

21-
"github.com/docker/docker/client"
2221
"github.com/google/go-containerregistry/pkg/name"
2322
v1 "github.com/google/go-containerregistry/pkg/v1"
2423
"github.com/google/go-containerregistry/pkg/v1/tarball"
24+
"github.com/moby/moby/client"
2525
)
2626

2727
// Tag adds a tag to an already existent image.

pkg/v1/daemon/write_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
"strings"
2323
"testing"
2424

25-
api "github.com/docker/docker/api/types/image"
26-
"github.com/docker/docker/client"
25+
api "github.com/moby/moby/api/types/image"
26+
"github.com/moby/moby/client"
2727

2828
"github.com/google/go-containerregistry/pkg/name"
2929
"github.com/google/go-containerregistry/pkg/v1/empty"

0 commit comments

Comments
 (0)