Skip to content

Commit

Permalink
Bump docker/cli
Browse files Browse the repository at this point in the history
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 <silvin.lubecki@docker.com>
  • Loading branch information
silvin-lubecki committed May 23, 2019
1 parent f2fbcae commit b4a8a4a
Show file tree
Hide file tree
Showing 46 changed files with 846 additions and 632 deletions.
27 changes: 14 additions & 13 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/commands/cnab.go
Expand Up @@ -296,7 +296,7 @@ func requiredBindMount(targetContextName string, targetOrchestrator string, s st
// in case of docker desktop, we want to rewrite the context in cases where it targets the local swarm or Kubernetes
s = &dockerDesktopAwareStore{Store: s}

ctxMeta, err := s.GetContextMetadata(targetContextName)
ctxMeta, err := s.GetMetadata(targetContextName)
if err != nil {
return bindMount{}, err
}
Expand Down
13 changes: 7 additions & 6 deletions internal/commands/dockerdesktop.go
Expand Up @@ -74,6 +74,7 @@ func (r *dockerDesktopKubernetesEndpointRewriter) rewrite(ep *kubernetes.Endpoin
ep.Host = fmt.Sprintf("https://%s:6443", ip)
}

// nolint:interfacer
func makeLinuxkitIPProvider(contextName string, s store.Store) dockerDesktopLinuxKitIPProvider {
return func() (string, error) {
clientCfg, err := kubernetes.ConfigFromContext(contextName, s)
Expand Down Expand Up @@ -104,7 +105,7 @@ func makeLinuxkitIPProvider(contextName string, s store.Store) dockerDesktopLinu
}
}

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

func (s dockerDesktopAwareStore) ListContexts() ([]store.ContextMetadata, error) {
contexts, err := s.Store.ListContexts()
func (s dockerDesktopAwareStore) List() ([]store.Metadata, error) {
contexts, err := s.Store.List()
if err != nil {
return nil, err
}
Expand All @@ -143,10 +144,10 @@ func (s dockerDesktopAwareStore) ListContexts() ([]store.ContextMetadata, error)
return contexts, nil
}

func (s dockerDesktopAwareStore) GetContextMetadata(name string) (store.ContextMetadata, error) {
context, err := s.Store.GetContextMetadata(name)
func (s dockerDesktopAwareStore) GetMetadata(name string) (store.Metadata, error) {
context, err := s.Store.GetMetadata(name)
if err != nil {
return store.ContextMetadata{}, err
return store.Metadata{}, err
}
rewriteContextIfDockerDesktop(&context, s.Store)
return context, nil
Expand Down
51 changes: 51 additions & 0 deletions vendor/github.com/Microsoft/hcsshim/osversion/osversion.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions vendor/github.com/Microsoft/hcsshim/osversion/windowsbuilds.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion vendor/github.com/docker/cli/AUTHORS

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 8 additions & 5 deletions vendor/github.com/docker/cli/cli-plugins/plugin/plugin.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions vendor/github.com/docker/cli/cli/command/cli.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/docker/cli/cli/command/context.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit b4a8a4a

Please sign in to comment.