toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Move IndexInfo and ServiceConfig types to api/types/registry/registry.go

Browse Source 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
Upstream-commit: 96c10098ac32f700f37358e2adc36c94741772bb
Component: engine
This commit is contained in:
Daniel Nephin
2015-12-11 18:14:52 -08:00
committed by Daniel Nephin
parent 0d867da41c
commit 7f5dff04d0
25 changed files with 187 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/engine/api/client/pull.go
View File

@ -8,7 +8,6 @@ import (
"github.com/docker/docker/api/client/lib"
"github.com/docker/docker/api/types"
Cli "github.com/docker/docker/cli"
"github.com/docker/docker/cliconfig"
"github.com/docker/docker/pkg/jsonmessage"
flag "github.com/docker/docker/pkg/mflag"
"github.com/docker/docker/registry"
@ -78,7 +77,7 @@ func (cli *DockerCli) CmdPull(args ...string) error {
func (cli *DockerCli) imagePullPrivileged(authConfig types.AuthConfig, imageID, tag string, requestPrivilege lib.RequestPrivilegeFunc) error {
encodedAuth, err := cliconfig.EncodeAuthToBase64(authConfig)
encodedAuth, err := encodeAuthToBase64(authConfig)
if err != nil {
return err
}