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

Merge pull request #16126 from calavera/remove_registry_circular_dep 

Make RegistryConfig a typed value in the api.
This commit is contained in:
Brian Goff 2015-09-08 09:37:53 -04:00
parent 2968558f61 719886d435
commit be7d346504
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/client/utils.go
View File

@ -27,6 +27,7 @@ import (
"github.com/docker/docker/pkg/stdcopy" "github.com/docker/docker/pkg/stdcopy"
"github.com/docker/docker/pkg/term" "github.com/docker/docker/pkg/term"
"github.com/docker/docker/registry" "github.com/docker/docker/registry"
"github.com/docker/docker/utils"
) )
var ( var (
@ -96,7 +97,7 @@ func (cli *DockerCli) clientRequest(method, path string, in io.Reader, headers m
} }
if err != nil { if err != nil {
if types.IsTimeout(err) || strings.Contains(err.Error(), "connection refused") || strings.Contains(err.Error(), "dial unix") { if utils.IsTimeout(err) || strings.Contains(err.Error(), "connection refused") || strings.Contains(err.Error(), "dial unix") {
return serverResp, errConnectionFailed return serverResp, errConnectionFailed
} }

3
api/types/types.go
View File

@ -6,6 +6,7 @@ import (
"github.com/docker/docker/daemon/network" "github.com/docker/docker/daemon/network"
"github.com/docker/docker/pkg/version" "github.com/docker/docker/pkg/version"
"github.com/docker/docker/registry"
"github.com/docker/docker/runconfig" "github.com/docker/docker/runconfig"
) )
@ -201,7 +202,7 @@ type Info struct {
KernelVersion string KernelVersion string
OperatingSystem string OperatingSystem string
IndexServerAddress string IndexServerAddress string
RegistryConfig interface{} RegistryConfig *registry.ServiceConfig
InitSha1 string InitSha1 string
InitPath string InitPath string
NCPU int NCPU int

4
registry/session.go
View File

@ -20,12 +20,12 @@ import (
"time" "time"
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/docker/docker/api/types"
"github.com/docker/docker/cliconfig" "github.com/docker/docker/cliconfig"
"github.com/docker/docker/pkg/httputils" "github.com/docker/docker/pkg/httputils"
"github.com/docker/docker/pkg/ioutils" "github.com/docker/docker/pkg/ioutils"
"github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/stringid"
"github.com/docker/docker/pkg/tarsum" "github.com/docker/docker/pkg/tarsum"
"github.com/docker/docker/utils"
) )
var ( var (
@ -425,7 +425,7 @@ func (r *Session) GetRepositoryData(remote string) (*RepositoryData, error) {
// and return a non-obtuse error message for users // and return a non-obtuse error message for users
// "Get https://index.docker.io/v1/repositories/library/busybox/images: i/o timeout" // "Get https://index.docker.io/v1/repositories/library/busybox/images: i/o timeout"
// was a top search on the docker user forum // was a top search on the docker user forum
if types.IsTimeout(err) { if utils.IsTimeout(err) {
return nil, fmt.Errorf("Network timed out while trying to connect to %s. You may want to check your internet connection or if you are behind a proxy.", repositoryTarget) return nil, fmt.Errorf("Network timed out while trying to connect to %s. You may want to check your internet connection or if you are behind a proxy.", repositoryTarget)
} }
return nil, fmt.Errorf("Error while pulling image: %v", err) return nil, fmt.Errorf("Error while pulling image: %v", err)

2
api/types/errors.go → utils/timeout.go
View File

@ -1,4 +1,4 @@
package types package utils
import ( import (
"net" "net"