Update dependencies (#5518)
This commit is contained in:
17
vendor/github.com/google/go-containerregistry/pkg/v1/remote/image.go
generated
vendored
17
vendor/github.com/google/go-containerregistry/pkg/v1/remote/image.go
generated
vendored
@@ -15,7 +15,6 @@
|
||||
package remote
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
@@ -101,15 +100,7 @@ func (r *remoteImage) RawConfigFile() ([]byte, error) {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if m.Config.Data != nil {
|
||||
if err := verify.Descriptor(m.Config); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
r.config = m.Config.Data
|
||||
return r.config, nil
|
||||
}
|
||||
|
||||
body, err := r.fetchBlob(r.context, m.Config.Size, m.Config.Digest)
|
||||
body, err := r.fetchBlob(r.context, m.Config.Digest)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -152,10 +143,6 @@ func (rl *remoteImageLayer) Compressed() (io.ReadCloser, error) {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if d.Data != nil {
|
||||
return verify.ReadCloser(ioutil.NopCloser(bytes.NewReader(d.Data)), d.Size, d.Digest)
|
||||
}
|
||||
|
||||
// We don't want to log binary layers -- this can break terminals.
|
||||
ctx := redact.NewContext(rl.ri.context, "omitting binary blobs from logs")
|
||||
|
||||
@@ -190,7 +177,7 @@ func (rl *remoteImageLayer) Compressed() (io.ReadCloser, error) {
|
||||
continue
|
||||
}
|
||||
|
||||
return verify.ReadCloser(resp.Body, d.Size, rl.digest)
|
||||
return verify.ReadCloser(resp.Body, rl.digest)
|
||||
}
|
||||
|
||||
return nil, lastErr
|
||||
|
||||
Reference in New Issue
Block a user