mirror of
https://github.com/containers/skopeo.git
synced 2025-10-24 21:35:38 +00:00
vendor: update to containers/image@a791c54467
Signed-off-by: Aleksa Sarai <asarai@suse.de>
This commit is contained in:
6
vendor/github.com/containers/image/docker/docker_client.go
generated
vendored
6
vendor/github.com/containers/image/docker/docker_client.go
generated
vendored
@@ -372,6 +372,10 @@ func (c *dockerClient) ping() (*pingResponse, error) {
|
||||
pr, err = ping("http")
|
||||
}
|
||||
if err != nil {
|
||||
err = fmt.Errorf("pinging docker registry returned %+v", err)
|
||||
if c.ctx.DockerDisableV1Ping {
|
||||
return nil, err
|
||||
}
|
||||
// best effort to understand if we're talking to a V1 registry
|
||||
pingV1 := func(scheme string) bool {
|
||||
url := fmt.Sprintf(baseURLV1, scheme, c.registry)
|
||||
@@ -393,8 +397,6 @@ func (c *dockerClient) ping() (*pingResponse, error) {
|
||||
}
|
||||
if isV1 {
|
||||
err = ErrV1NotSupported
|
||||
} else {
|
||||
err = fmt.Errorf("pinging docker registry returned %+v", err)
|
||||
}
|
||||
}
|
||||
return pr, err
|
||||
|
||||
Reference in New Issue
Block a user