mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Remove more of registry v1 code.
Signed-off-by: Tibor Vass <tibor@docker.com> Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
parent
4a054ec00f
commit
7a50fe8a52
16 changed files with 43 additions and 199 deletions
|
|
@ -34,10 +34,6 @@ func (e ErrNoSupport) Error() string {
|
|||
type fallbackError struct {
|
||||
// err is the error being wrapped.
|
||||
err error
|
||||
// confirmedV2 is set to true if it was confirmed that the registry
|
||||
// supports the v2 protocol. This is used to limit fallbacks to the v1
|
||||
// protocol.
|
||||
confirmedV2 bool
|
||||
// transportOK is set to true if we managed to speak HTTP with the
|
||||
// registry. This confirms that we're using appropriate TLS settings
|
||||
// (or lack of TLS).
|
||||
|
|
@ -53,15 +49,6 @@ func (f fallbackError) Cause() error {
|
|||
return f.err
|
||||
}
|
||||
|
||||
// shouldV2Fallback returns true if this error is a reason to fall back to v1.
|
||||
func shouldV2Fallback(err errcode.Error) bool {
|
||||
switch err.Code {
|
||||
case errcode.ErrorCodeUnauthorized, v2.ErrorCodeManifestUnknown, v2.ErrorCodeNameUnknown:
|
||||
return true
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
type notFoundError struct {
|
||||
cause errcode.Error
|
||||
ref reference.Named
|
||||
|
|
@ -141,7 +128,7 @@ func continueOnError(err error, mirrorEndpoint bool) bool {
|
|||
case ErrNoSupport:
|
||||
return continueOnError(v.Err, mirrorEndpoint)
|
||||
case errcode.Error:
|
||||
return mirrorEndpoint || shouldV2Fallback(v)
|
||||
return mirrorEndpoint
|
||||
case *client.UnexpectedHTTPResponseError:
|
||||
return true
|
||||
case ImageConfigPullError:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue