Merge pull request #26456 from dnephin/move_cli_command_registry

Remove registry/auth helper methods from the DockerCLI object
Upstream-commit: e8b9f38c7e2e249084c78c81f136c6d22432af6f
Component: engine
This commit is contained in:
Antonio Murdaca
2016-09-12 15:11:04 +02:00
committed by GitHub
16 changed files with 72 additions and 113 deletions

View File

@ -85,7 +85,7 @@ func pullImage(ctx context.Context, dockerCli *command.DockerCli, image string,
return err
}
authConfig := dockerCli.ResolveAuthConfig(ctx, repoInfo.Index)
authConfig := command.ResolveAuthConfig(ctx, dockerCli, repoInfo.Index)
encodedAuth, err := command.EncodeAuthToBase64(authConfig)
if err != nil {
return err