Make RegistryConfig a typed value in the api.
Remove possible circular dependency that prevented us from using a real type. Signed-off-by: David Calavera <david.calavera@gmail.com>master
							parent
							
								
									ec8bba861e
								
							
						
					
					
						commit
						2b658054bb
					
				| 
						 | 
				
			
			@ -20,12 +20,12 @@ import (
 | 
			
		|||
	"time"
 | 
			
		||||
 | 
			
		||||
	"github.com/Sirupsen/logrus"
 | 
			
		||||
	"github.com/docker/docker/api/types"
 | 
			
		||||
	"github.com/docker/docker/cliconfig"
 | 
			
		||||
	"github.com/docker/docker/pkg/httputils"
 | 
			
		||||
	"github.com/docker/docker/pkg/ioutils"
 | 
			
		||||
	"github.com/docker/docker/pkg/stringid"
 | 
			
		||||
	"github.com/docker/docker/pkg/tarsum"
 | 
			
		||||
	"github.com/docker/docker/utils"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
var (
 | 
			
		||||
| 
						 | 
				
			
			@ -425,7 +425,7 @@ func (r *Session) GetRepositoryData(remote string) (*RepositoryData, error) {
 | 
			
		|||
		// and return a non-obtuse error message for users
 | 
			
		||||
		// "Get https://index.docker.io/v1/repositories/library/busybox/images: i/o timeout"
 | 
			
		||||
		// 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("Error while pulling image: %v", err)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue