From 66761c0284e101de1e380dcdfa210a9f94c086a7 Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Thu, 6 Aug 2015 12:35:43 -0400 Subject: [PATCH] Better/more specific error messages on connect Closes #15309 Signed-off-by: Brian Goff --- docs/session.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/session.go b/docs/session.go index a9c4daf3..d497cb95 100644 --- a/docs/session.go +++ b/docs/session.go @@ -20,6 +20,7 @@ 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" @@ -424,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 strings.HasSuffix(err.Error(), "i/o timeout") { + if types.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)