Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove remaining registry methods from DockerCLI. 

Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2016-09-09 15:38:00 -04:00
parent 4ae4e66e3c
commit a26ba0e702
13 changed files with 40 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
command/container/create.go
View File

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

4
command/image/pull.go
View File

@ -73,8 +73,8 @@ func runPull(dockerCli *command.DockerCli, opts pullOptions) error {
ctx := context.Background() ctx := context.Background()
authConfig := dockerCli.ResolveAuthConfig(ctx, repoInfo.Index) authConfig := command.ResolveAuthConfig(ctx, dockerCli, repoInfo.Index)
requestPrivilege := dockerCli.RegistryAuthenticationPrivilegedFunc(repoInfo.Index, "pull") requestPrivilege := command.RegistryAuthenticationPrivilegedFunc(dockerCli, repoInfo.Index, "pull")
if command.IsTrusted() && !registryRef.HasDigest() { if command.IsTrusted() && !registryRef.HasDigest() {
// Check if tag is digest // Check if tag is digest

4
command/image/push.go
View File

@ -44,8 +44,8 @@ func runPush(dockerCli *command.DockerCli, remote string) error {
ctx := context.Background() ctx := context.Background()
// Resolve the Auth config relevant for this server // Resolve the Auth config relevant for this server
authConfig := dockerCli.ResolveAuthConfig(ctx, repoInfo.Index) authConfig := command.ResolveAuthConfig(ctx, dockerCli, repoInfo.Index)
requestPrivilege := dockerCli.RegistryAuthenticationPrivilegedFunc(repoInfo.Index, "push") requestPrivilege := command.RegistryAuthenticationPrivilegedFunc(dockerCli, repoInfo.Index, "push")
if command.IsTrusted() { if command.IsTrusted() {
return trustedPush(ctx, dockerCli, repoInfo, ref, authConfig, requestPrivilege) return trustedPush(ctx, dockerCli, repoInfo, ref, authConfig, requestPrivilege)

4
command/image/search.go
View File

@ -66,8 +66,8 @@ func runSearch(dockerCli *command.DockerCli, opts searchOptions) error {
ctx := context.Background() ctx := context.Background()
authConfig := dockerCli.ResolveAuthConfig(ctx, indexInfo) authConfig := command.ResolveAuthConfig(ctx, dockerCli, indexInfo)
requestPrivilege := dockerCli.RegistryAuthenticationPrivilegedFunc(indexInfo, "search") requestPrivilege := command.RegistryAuthenticationPrivilegedFunc(dockerCli, indexInfo, "search")
encodedAuth, err := command.EncodeAuthToBase64(authConfig) encodedAuth, err := command.EncodeAuthToBase64(authConfig)
if err != nil { if err != nil {

2
command/image/trust.go
View File

@ -499,7 +499,7 @@ func TrustedReference(ctx context.Context, cli *command.DockerCli, ref reference
} }
// Resolve the Auth config relevant for this server // Resolve the Auth config relevant for this server
authConfig := cli.ResolveAuthConfig(ctx, repoInfo.Index) authConfig := command.ResolveAuthConfig(ctx, cli, repoInfo.Index)
notaryRepo, err := GetNotaryRepository(cli, repoInfo, authConfig, "pull") notaryRepo, err := GetNotaryRepository(cli, repoInfo, authConfig, "pull")
if err != nil { if err != nil {

4
command/plugin/install.go
View File

@ -61,14 +61,14 @@ func runInstall(dockerCli *command.DockerCli, opts pluginOptions) error {
return err return err
} }
authConfig := dockerCli.ResolveAuthConfig(ctx, repoInfo.Index) authConfig := command.ResolveAuthConfig(ctx, dockerCli, repoInfo.Index)
encodedAuth, err := command.EncodeAuthToBase64(authConfig) encodedAuth, err := command.EncodeAuthToBase64(authConfig)
if err != nil { if err != nil {
return err return err
} }
registryAuthFunc := dockerCli.RegistryAuthenticationPrivilegedFunc(repoInfo.Index, "plugin install") registryAuthFunc := command.RegistryAuthenticationPrivilegedFunc(dockerCli, repoInfo.Index, "plugin install")
options := types.PluginInstallOptions{ options := types.PluginInstallOptions{
RegistryAuth: encodedAuth, RegistryAuth: encodedAuth,

2
command/plugin/push.go
View File

@ -45,7 +45,7 @@ func runPush(dockerCli *command.DockerCli, name string) error {
if err != nil { if err != nil {
return err return err
} }
authConfig := dockerCli.ResolveAuthConfig(ctx, repoInfo.Index) authConfig := command.ResolveAuthConfig(ctx, dockerCli, repoInfo.Index)
encodedAuth, err := command.EncodeAuthToBase64(authConfig) encodedAuth, err := command.EncodeAuthToBase64(authConfig)
if err != nil { if err != nil {

52
command/registry.go
View File

@ -20,15 +20,14 @@ import (
) )
// ElectAuthServer returns the default registry to use (by asking the daemon) // ElectAuthServer returns the default registry to use (by asking the daemon)
// TODO: only used in registry package and from ResolveAuthConfig func ElectAuthServer(ctx context.Context, cli *DockerCli) string {
func (cli *DockerCli) ElectAuthServer(ctx context.Context) string {
// The daemon `/info` endpoint informs us of the default registry being // The daemon `/info` endpoint informs us of the default registry being
// used. This is essential in cross-platforms environment, where for // used. This is essential in cross-platforms environment, where for
// example a Linux client might be interacting with a Windows daemon, hence // example a Linux client might be interacting with a Windows daemon, hence
// the default registry URL might be Windows specific. // the default registry URL might be Windows specific.
serverAddress := registry.IndexServer serverAddress := registry.IndexServer
if info, err := cli.client.Info(ctx); err != nil { if info, err := cli.Client().Info(ctx); err != nil {
fmt.Fprintf(cli.out, "Warning: failed to get default registry endpoint from daemon (%v). Using system default: %s\n", err, serverAddress) fmt.Fprintf(cli.Out(), "Warning: failed to get default registry endpoint from daemon (%v). Using system default: %s\n", err, serverAddress)
} else { } else {
serverAddress = info.IndexServerAddress serverAddress = info.IndexServerAddress
} }
@ -46,13 +45,12 @@ func EncodeAuthToBase64(authConfig types.AuthConfig) (string, error) {
// RegistryAuthenticationPrivilegedFunc returns a RequestPrivilegeFunc from the specified registry index info // RegistryAuthenticationPrivilegedFunc returns a RequestPrivilegeFunc from the specified registry index info
// for the given command. // for the given command.
// TODO: image/plugin func RegistryAuthenticationPrivilegedFunc(cli *DockerCli, index *registrytypes.IndexInfo, cmdName string) types.RequestPrivilegeFunc {
func (cli *DockerCli) RegistryAuthenticationPrivilegedFunc(index *registrytypes.IndexInfo, cmdName string) types.RequestPrivilegeFunc {
return func() (string, error) { return func() (string, error) {
fmt.Fprintf(cli.out, "\nPlease login prior to %s:\n", cmdName) fmt.Fprintf(cli.Out(), "\nPlease login prior to %s:\n", cmdName)
indexServer := registry.GetAuthConfigKey(index) indexServer := registry.GetAuthConfigKey(index)
isDefaultRegistry := indexServer == cli.ElectAuthServer(context.Background()) isDefaultRegistry := indexServer == ElectAuthServer(context.Background(), cli)
authConfig, err := cli.ConfigureAuth("", "", indexServer, isDefaultRegistry) authConfig, err := ConfigureAuth(cli, "", "", indexServer, isDefaultRegistry)
if err != nil { if err != nil {
return "", err return "", err
} }
@ -63,11 +61,10 @@ func (cli *DockerCli) RegistryAuthenticationPrivilegedFunc(index *registrytypes.
// ResolveAuthConfig is like registry.ResolveAuthConfig, but if using the // ResolveAuthConfig is like registry.ResolveAuthConfig, but if using the
// default index, it uses the default index name for the daemon's platform, // default index, it uses the default index name for the daemon's platform,
// not the client's platform. // not the client's platform.
// TODO: plugin/image/container and from RetrieveAuthTokenFromImage func ResolveAuthConfig(ctx context.Context, cli *DockerCli, index *registrytypes.IndexInfo) types.AuthConfig {
func (cli *DockerCli) ResolveAuthConfig(ctx context.Context, index *registrytypes.IndexInfo) types.AuthConfig {
configKey := index.Name configKey := index.Name
if index.Official { if index.Official {
configKey = cli.ElectAuthServer(ctx) configKey = ElectAuthServer(ctx, cli)
} }
a, _ := cli.CredentialsStore().Get(configKey) a, _ := cli.CredentialsStore().Get(configKey)
@ -75,8 +72,7 @@ func (cli *DockerCli) ResolveAuthConfig(ctx context.Context, index *registrytype
} }
// ConfigureAuth returns an AuthConfig from the specified user, password and server. // ConfigureAuth returns an AuthConfig from the specified user, password and server.
// TODO: only used in registry package func ConfigureAuth(cli *DockerCli, flUser, flPassword, serverAddress string, isDefaultRegistry bool) (types.AuthConfig, error) {
func (cli *DockerCli) ConfigureAuth(flUser, flPassword, serverAddress string, isDefaultRegistry bool) (types.AuthConfig, error) {
// On Windows, force the use of the regular OS stdin stream. Fixes #14336/#14210 // On Windows, force the use of the regular OS stdin stream. Fixes #14336/#14210
if runtime.GOOS == "windows" { if runtime.GOOS == "windows" {
cli.in = NewInStream(os.Stdin) cli.in = NewInStream(os.Stdin)
@ -107,10 +103,10 @@ func (cli *DockerCli) ConfigureAuth(flUser, flPassword, serverAddress string, is
if flUser = strings.TrimSpace(flUser); flUser == "" { if flUser = strings.TrimSpace(flUser); flUser == "" {
if isDefaultRegistry { if isDefaultRegistry {
// if this is a default registry (docker hub), then display the following message. // if this is a default registry (docker hub), then display the following message.
fmt.Fprintln(cli.out, "Login with your Docker ID to push and pull images from Docker Hub. If you don't have a Docker ID, head over to https://hub.docker.com to create one.") fmt.Fprintln(cli.Out(), "Login with your Docker ID to push and pull images from Docker Hub. If you don't have a Docker ID, head over to https://hub.docker.com to create one.")
} }
cli.promptWithDefault("Username", authconfig.Username) promptWithDefault(cli.Out(), "Username", authconfig.Username)
flUser = readInput(cli.in, cli.out) flUser = readInput(cli.In(), cli.Out())
flUser = strings.TrimSpace(flUser) flUser = strings.TrimSpace(flUser)
if flUser == "" { if flUser == "" {
flUser = authconfig.Username flUser = authconfig.Username
@ -124,11 +120,11 @@ func (cli *DockerCli) ConfigureAuth(flUser, flPassword, serverAddress string, is
if err != nil { if err != nil {
return authconfig, err return authconfig, err
} }
fmt.Fprintf(cli.out, "Password: ") fmt.Fprintf(cli.Out(), "Password: ")
term.DisableEcho(cli.In().FD(), oldState) term.DisableEcho(cli.In().FD(), oldState)
flPassword = readInput(cli.in, cli.out) flPassword = readInput(cli.In(), cli.Out())
fmt.Fprint(cli.out, "\n") fmt.Fprint(cli.Out(), "\n")
term.RestoreTerminal(cli.In().FD(), oldState) term.RestoreTerminal(cli.In().FD(), oldState)
if flPassword == "" { if flPassword == "" {
@ -154,19 +150,18 @@ func readInput(in io.Reader, out io.Writer) string {
return string(line) return string(line)
} }
func (cli *DockerCli) promptWithDefault(prompt string, configDefault string) { func promptWithDefault(out io.Writer, prompt string, configDefault string) {
if configDefault == "" { if configDefault == "" {
fmt.Fprintf(cli.out, "%s: ", prompt) fmt.Fprintf(out, "%s: ", prompt)
} else { } else {
fmt.Fprintf(cli.out, "%s (%s): ", prompt, configDefault) fmt.Fprintf(out, "%s (%s): ", prompt, configDefault)
} }
} }
// RetrieveAuthTokenFromImage retrieves an encoded auth token given a complete image // RetrieveAuthTokenFromImage retrieves an encoded auth token given a complete image
// TODO: used in service/stack packages func RetrieveAuthTokenFromImage(ctx context.Context, cli *DockerCli, image string) (string, error) {
func (cli *DockerCli) RetrieveAuthTokenFromImage(ctx context.Context, image string) (string, error) {
// Retrieve encoded auth token from the image reference // Retrieve encoded auth token from the image reference
authConfig, err := cli.resolveAuthConfigFromImage(ctx, image) authConfig, err := resolveAuthConfigFromImage(ctx, cli, image)
if err != nil { if err != nil {
return "", err return "", err
} }
@ -178,7 +173,7 @@ func (cli *DockerCli) RetrieveAuthTokenFromImage(ctx context.Context, image stri
} }
// resolveAuthConfigFromImage retrieves that AuthConfig using the image string // resolveAuthConfigFromImage retrieves that AuthConfig using the image string
func (cli *DockerCli) resolveAuthConfigFromImage(ctx context.Context, image string) (types.AuthConfig, error) { func resolveAuthConfigFromImage(ctx context.Context, cli *DockerCli, image string) (types.AuthConfig, error) {
registryRef, err := reference.ParseNamed(image) registryRef, err := reference.ParseNamed(image)
if err != nil { if err != nil {
return types.AuthConfig{}, err return types.AuthConfig{}, err
@ -187,6 +182,5 @@ func (cli *DockerCli) resolveAuthConfigFromImage(ctx context.Context, image stri
if err != nil { if err != nil {
return types.AuthConfig{}, err return types.AuthConfig{}, err
} }
authConfig := cli.ResolveAuthConfig(ctx, repoInfo.Index) return ResolveAuthConfig(ctx, cli, repoInfo.Index), nil
return authConfig, nil
} }

4
command/registry/login.go
View File

@ -52,7 +52,7 @@ func runLogin(dockerCli *command.DockerCli, opts loginOptions) error {
var ( var (
serverAddress string serverAddress string
authServer = dockerCli.ElectAuthServer(ctx) authServer = command.ElectAuthServer(ctx, dockerCli)
) )
if opts.serverAddress != "" { if opts.serverAddress != "" {
serverAddress = opts.serverAddress serverAddress = opts.serverAddress
@ -62,7 +62,7 @@ func runLogin(dockerCli *command.DockerCli, opts loginOptions) error {
isDefaultRegistry := serverAddress == authServer isDefaultRegistry := serverAddress == authServer
authConfig, err := dockerCli.ConfigureAuth(opts.user, opts.password, serverAddress, isDefaultRegistry) authConfig, err := command.ConfigureAuth(dockerCli, opts.user, opts.password, serverAddress, isDefaultRegistry)
if err != nil { if err != nil {
return err return err
} }

2
command/registry/logout.go
View File

@ -35,7 +35,7 @@ func runLogout(dockerCli *command.DockerCli, serverAddress string) error {
var isDefaultRegistry bool var isDefaultRegistry bool
if serverAddress == "" { if serverAddress == "" {
serverAddress = dockerCli.ElectAuthServer(ctx) serverAddress = command.ElectAuthServer(ctx, dockerCli)
isDefaultRegistry = true isDefaultRegistry = true
} }

2
command/service/create.go
View File

@ -55,7 +55,7 @@ func runCreate(dockerCli *command.DockerCli, opts *serviceOptions) error {
// only send auth if flag was set // only send auth if flag was set
if opts.registryAuth { if opts.registryAuth {
// Retrieve encoded auth token from the image reference // Retrieve encoded auth token from the image reference
encodedAuth, err := dockerCli.RetrieveAuthTokenFromImage(ctx, opts.image) encodedAuth, err := command.RetrieveAuthTokenFromImage(ctx, dockerCli, opts.image)
if err != nil { if err != nil {
return err return err
} }

2
command/service/update.go
View File

@ -82,7 +82,7 @@ func runUpdate(dockerCli *command.DockerCli, flags *pflag.FlagSet, serviceID str
// Retrieve encoded auth token from the image reference // Retrieve encoded auth token from the image reference
// This would be the old image if it didn't change in this update // This would be the old image if it didn't change in this update
image := service.Spec.TaskTemplate.ContainerSpec.Image image := service.Spec.TaskTemplate.ContainerSpec.Image
encodedAuth, err := dockerCli.RetrieveAuthTokenFromImage(ctx, image) encodedAuth, err := command.RetrieveAuthTokenFromImage(ctx, dockerCli, image)
if err != nil { if err != nil {
return err return err
} }

2
command/stack/deploy.go
View File

@ -197,7 +197,7 @@ func deployServices(
if sendAuth { if sendAuth {
// Retrieve encoded auth token from the image reference // Retrieve encoded auth token from the image reference
image := serviceSpec.TaskTemplate.ContainerSpec.Image image := serviceSpec.TaskTemplate.ContainerSpec.Image
encodedAuth, err = dockerCli.RetrieveAuthTokenFromImage(ctx, image) encodedAuth, err = command.RetrieveAuthTokenFromImage(ctx, dockerCli, image)
if err != nil { if err != nil {
return err return err
} }