diff options
| author | Tibor Vass <tibor@docker.com> | 2015-07-30 19:03:38 -0400 |
|---|---|---|
| committer | Tibor Vass <tibor@docker.com> | 2015-07-30 19:03:38 -0400 |
| commit | a21ba12f4e7f11c17e6d665716f3060b9923b11c (patch) | |
| tree | d34e7940627c1c9adbc03547191288d7c00a6557 /registry/registry.go | |
| parent | 5c9e5bfb0f9006f6c7ec98bc26cfd9f6889b459a (diff) | |
| download | docker-a21ba12f4e7f11c17e6d665716f3060b9923b11c.tar.gz | |
registry: allow fallback on unknown errors
This patch fixes a bug where a user specifies a v1 mirror for
--registry-mirror and pull an image from the Hub.
It used to not fallback because of an unexpected error returned when
trying to JSON marshal nginx output.
We now ensure that any unexpected error falls back to the next endpoint
in the list.
Signed-off-by: Tibor Vass <tibor@docker.com>
Diffstat (limited to 'registry/registry.go')
| -rw-r--r-- | registry/registry.go | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/registry/registry.go b/registry/registry.go index 74f731bdca..9fb71d1758 100644 --- a/registry/registry.go +++ b/registry/registry.go @@ -17,6 +17,7 @@ import ( "github.com/Sirupsen/logrus" "github.com/docker/distribution/registry/api/errcode" "github.com/docker/distribution/registry/api/v2" + "github.com/docker/distribution/registry/client" "github.com/docker/distribution/registry/client/transport" "github.com/docker/docker/autogen/dockerversion" "github.com/docker/docker/pkg/parsers/kernel" @@ -211,8 +212,14 @@ func ContinueOnError(err error) bool { return ContinueOnError(v.Err) case errcode.Error: return shouldV2Fallback(v) + case *client.UnexpectedHTTPResponseError: + return true } - return false + // let's be nice and fallback if the error is a completely + // unexpected one. + // If new errors have to be handled in some way, please + // add them to the switch above. + return true } // NewTransport returns a new HTTP transport. If tlsConfig is nil, it uses the |