Skip to content
This repository was archived by the owner on Jul 18, 2025. It is now read-only.

Commit b4a8a4a

Browse files
Bump docker/cli
Bump docker/docker Fix last changes on context stores made on docker/cli (the main store interface has been split to multiple smaller interfaces). Signed-off-by: Silvin Lubecki <[email protected]>
1 parent f2fbcae commit b4a8a4a

Some content is hidden

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

46 files changed

+846
-632
lines changed

Gopkg.lock

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

internal/commands/cnab.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ func requiredBindMount(targetContextName string, targetOrchestrator string, s st
296296
// in case of docker desktop, we want to rewrite the context in cases where it targets the local swarm or Kubernetes
297297
s = &dockerDesktopAwareStore{Store: s}
298298

299-
ctxMeta, err := s.GetContextMetadata(targetContextName)
299+
ctxMeta, err := s.GetMetadata(targetContextName)
300300
if err != nil {
301301
return bindMount{}, err
302302
}

internal/commands/dockerdesktop.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ func (r *dockerDesktopKubernetesEndpointRewriter) rewrite(ep *kubernetes.Endpoin
7474
ep.Host = fmt.Sprintf("https://%s:6443", ip)
7575
}
7676

77+
// nolint:interfacer
7778
func makeLinuxkitIPProvider(contextName string, s store.Store) dockerDesktopLinuxKitIPProvider {
7879
return func() (string, error) {
7980
clientCfg, err := kubernetes.ConfigFromContext(contextName, s)
@@ -104,7 +105,7 @@ func makeLinuxkitIPProvider(contextName string, s store.Store) dockerDesktopLinu
104105
}
105106
}
106107

107-
func rewriteContextIfDockerDesktop(meta *store.ContextMetadata, s store.Store) {
108+
func rewriteContextIfDockerDesktop(meta *store.Metadata, s store.Store) {
108109
// errors are treated as "don't rewrite"
109110
rewriter := dockerDesktopDockerEndpointRewriter{
110111
defaultHostProvider: defaultDockerDesktopHostProvider,
@@ -131,8 +132,8 @@ type dockerDesktopAwareStore struct {
131132
store.Store
132133
}
133134

134-
func (s dockerDesktopAwareStore) ListContexts() ([]store.ContextMetadata, error) {
135-
contexts, err := s.Store.ListContexts()
135+
func (s dockerDesktopAwareStore) List() ([]store.Metadata, error) {
136+
contexts, err := s.Store.List()
136137
if err != nil {
137138
return nil, err
138139
}
@@ -143,10 +144,10 @@ func (s dockerDesktopAwareStore) ListContexts() ([]store.ContextMetadata, error)
143144
return contexts, nil
144145
}
145146

146-
func (s dockerDesktopAwareStore) GetContextMetadata(name string) (store.ContextMetadata, error) {
147-
context, err := s.Store.GetContextMetadata(name)
147+
func (s dockerDesktopAwareStore) GetMetadata(name string) (store.Metadata, error) {
148+
context, err := s.Store.GetMetadata(name)
148149
if err != nil {
149-
return store.ContextMetadata{}, err
150+
return store.Metadata{}, err
150151
}
151152
rewriteContextIfDockerDesktop(&context, s.Store)
152153
return context, nil

vendor/github.com/Microsoft/hcsshim/osversion/osversion.go

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

vendor/github.com/Microsoft/hcsshim/osversion/windowsbuilds.go

Lines changed: 10 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/cli/AUTHORS

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

vendor/github.com/docker/cli/cli-plugins/manager/manager.go

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

vendor/github.com/docker/cli/cli-plugins/plugin/plugin.go

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

vendor/github.com/docker/cli/cli/command/cli.go

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

vendor/github.com/docker/cli/cli/command/context.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.

0 commit comments

Comments
 (0)