Skip to content

Commit f6b90bc

Browse files
committed
add internal fork of docker/docker/registry
This adds an internal fork of [github.com/docker/docker/registry], taken at commit [moby@f651a5d]. Git history was not preserved in this fork, but can be found using the URLs provided. This fork was created to remove the dependency on the "Moby" codebase, and because the CLI only needs a subset of its features. The original package was written specifically for use in the daemon code, and includes functionality that cannot be used in the CLI. [github.com/docker/docker/registry]: https://pkg.go.dev/github.com/docker/[email protected]+incompatible/registry [moby@49306c6]: https://github.com/moby/moby/tree/49306c607b72c5bf0a8e426f5a9760fa5ef96ea0/registry Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 636a4cf commit f6b90bc

33 files changed

+1886
-17
lines changed

cli/command/image/push.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import (
1616
"github.com/docker/cli/cli/command/completion"
1717
"github.com/docker/cli/cli/streams"
1818
"github.com/docker/cli/internal/jsonstream"
19+
"github.com/docker/cli/internal/registry"
1920
"github.com/docker/cli/internal/tui"
20-
"github.com/docker/docker/registry"
2121
"github.com/moby/moby/api/types/auxprogress"
2222
"github.com/moby/moby/api/types/image"
2323
registrytypes "github.com/moby/moby/api/types/registry"

cli/command/image/trust.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/docker/cli/cli/streams"
1212
"github.com/docker/cli/cli/trust"
1313
"github.com/docker/cli/internal/jsonstream"
14-
"github.com/docker/docker/registry"
14+
"github.com/docker/cli/internal/registry"
1515
"github.com/moby/moby/api/types/image"
1616
registrytypes "github.com/moby/moby/api/types/registry"
1717
"github.com/opencontainers/go-digest"

cli/command/plugin/install.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/docker/cli/cli/command/image"
1212
"github.com/docker/cli/internal/jsonstream"
1313
"github.com/docker/cli/internal/prompt"
14-
"github.com/docker/docker/registry"
14+
"github.com/docker/cli/internal/registry"
1515
"github.com/moby/moby/api/types"
1616
registrytypes "github.com/moby/moby/api/types/registry"
1717
"github.com/pkg/errors"

cli/command/plugin/push.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/docker/cli/cli/command"
99
"github.com/docker/cli/cli/trust"
1010
"github.com/docker/cli/internal/jsonstream"
11-
"github.com/docker/docker/registry"
11+
"github.com/docker/cli/internal/registry"
1212
registrytypes "github.com/moby/moby/api/types/registry"
1313
"github.com/pkg/errors"
1414
"github.com/spf13/cobra"

cli/command/registry/login.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import (
1515
"github.com/docker/cli/cli/config/configfile"
1616
configtypes "github.com/docker/cli/cli/config/types"
1717
"github.com/docker/cli/internal/oauth/manager"
18+
"github.com/docker/cli/internal/registry"
1819
"github.com/docker/cli/internal/tui"
19-
"github.com/docker/docker/registry"
2020
registrytypes "github.com/moby/moby/api/types/registry"
2121
"github.com/moby/moby/client"
2222
"github.com/pkg/errors"

cli/command/registry/login_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313
configtypes "github.com/docker/cli/cli/config/types"
1414
"github.com/docker/cli/cli/streams"
1515
"github.com/docker/cli/internal/prompt"
16+
"github.com/docker/cli/internal/registry"
1617
"github.com/docker/cli/internal/test"
17-
"github.com/docker/docker/registry"
1818
registrytypes "github.com/moby/moby/api/types/registry"
1919
"github.com/moby/moby/api/types/system"
2020
"github.com/moby/moby/client"

cli/command/registry/logout.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/docker/cli/cli/command"
99
"github.com/docker/cli/cli/config/credentials"
1010
"github.com/docker/cli/internal/oauth/manager"
11-
"github.com/docker/docker/registry"
11+
"github.com/docker/cli/internal/registry"
1212
"github.com/spf13/cobra"
1313
)
1414

cli/command/service/trust.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"github.com/distribution/reference"
77
"github.com/docker/cli/cli/command"
88
"github.com/docker/cli/cli/trust"
9-
"github.com/docker/docker/registry"
9+
"github.com/docker/cli/internal/registry"
1010
"github.com/moby/moby/api/types/swarm"
1111
"github.com/opencontainers/go-digest"
1212
"github.com/pkg/errors"

cli/command/system/info.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"github.com/docker/cli/cli/debug"
2020
flagsHelper "github.com/docker/cli/cli/flags"
2121
"github.com/docker/cli/internal/lazyregexp"
22+
"github.com/docker/cli/internal/registry"
2223
"github.com/docker/cli/templates"
23-
"github.com/docker/docker/registry"
2424
"github.com/docker/go-units"
2525
"github.com/moby/moby/api/types/swarm"
2626
"github.com/moby/moby/api/types/system"

cli/registry/client/endpoint.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"time"
77

88
"github.com/distribution/reference"
9+
"github.com/docker/cli/internal/registry"
910
"github.com/docker/distribution/registry/client/auth"
1011
"github.com/docker/distribution/registry/client/transport"
11-
"github.com/docker/docker/registry"
1212
registrytypes "github.com/moby/moby/api/types/registry"
1313
"github.com/pkg/errors"
1414
)

0 commit comments

Comments
 (0)