mirror of
https://github.com/mudler/luet.git
synced 2025-09-26 07:10:25 +00:00
bump github.com/moby/buildkit to v0.13.0 (#351)
* bump github.com/moby/buildkit to v0.13.0 Signed-off-by: Nianyu Shen <nianyu@spectrocloud.com> * fix: update dep usage based on newer version Signed-off-by: Nianyu Shen <nianyu@spectrocloud.com> * remove empty line Signed-off-by: Nianyu Shen <nianyu@spectrocloud.com> * ci: bump golang to 1.21.x * Bump moby * debug --------- Signed-off-by: Nianyu Shen <nianyu@spectrocloud.com> Co-authored-by: Nianyu Shen <nianyu@spectrocloud.com>
This commit is contained in:
committed by
GitHub
parent
c47bf4833a
commit
4c788ccbd1
23
vendor/github.com/google/go-containerregistry/pkg/v1/daemon/image.go
generated
vendored
23
vendor/github.com/google/go-containerregistry/pkg/v1/daemon/image.go
generated
vendored
@@ -18,7 +18,6 @@ import (
|
||||
"bytes"
|
||||
"context"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
"sync"
|
||||
|
||||
"github.com/google/go-containerregistry/pkg/name"
|
||||
@@ -31,6 +30,7 @@ type image struct {
|
||||
ref name.Reference
|
||||
opener *imageOpener
|
||||
tarballImage v1.Image
|
||||
id *v1.Hash
|
||||
|
||||
once sync.Once
|
||||
err error
|
||||
@@ -62,12 +62,12 @@ func (i *imageOpener) bufferedOpener() (io.ReadCloser, error) {
|
||||
}
|
||||
defer rc.Close()
|
||||
|
||||
return ioutil.ReadAll(rc)
|
||||
return io.ReadAll(rc)
|
||||
}()
|
||||
})
|
||||
|
||||
// Wrap the bytes in a ReadCloser so it looks like an opened file.
|
||||
return ioutil.NopCloser(bytes.NewReader(i.bytes)), i.err
|
||||
return io.NopCloser(bytes.NewReader(i.bytes)), i.err
|
||||
}
|
||||
|
||||
func (i *imageOpener) opener() tarball.Opener {
|
||||
@@ -95,10 +95,20 @@ func Image(ref name.Reference, options ...Option) (v1.Image, error) {
|
||||
ctx: o.ctx,
|
||||
}
|
||||
|
||||
return &image{
|
||||
img := &image{
|
||||
ref: ref,
|
||||
opener: i,
|
||||
}, nil
|
||||
}
|
||||
|
||||
// Eagerly fetch Image ID to ensure it actually exists.
|
||||
// https://github.com/google/go-containerregistry/issues/1186
|
||||
id, err := img.ConfigName()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
img.id = &id
|
||||
|
||||
return img, nil
|
||||
}
|
||||
|
||||
func (i *image) initialize() error {
|
||||
@@ -133,6 +143,9 @@ func (i *image) Size() (int64, error) {
|
||||
}
|
||||
|
||||
func (i *image) ConfigName() (v1.Hash, error) {
|
||||
if i.id != nil {
|
||||
return *i.id, nil
|
||||
}
|
||||
res, _, err := i.opener.client.ImageInspectWithRaw(i.opener.ctx, i.ref.String())
|
||||
if err != nil {
|
||||
return v1.Hash{}, err
|
||||
|
3
vendor/github.com/google/go-containerregistry/pkg/v1/daemon/write.go
generated
vendored
3
vendor/github.com/google/go-containerregistry/pkg/v1/daemon/write.go
generated
vendored
@@ -17,7 +17,6 @@ package daemon
|
||||
import (
|
||||
"fmt"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
|
||||
"github.com/google/go-containerregistry/pkg/name"
|
||||
v1 "github.com/google/go-containerregistry/pkg/v1"
|
||||
@@ -52,7 +51,7 @@ func Write(tag name.Tag, img v1.Image, options ...Option) (string, error) {
|
||||
return "", fmt.Errorf("error loading image: %w", err)
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
b, err := ioutil.ReadAll(resp.Body)
|
||||
b, err := io.ReadAll(resp.Body)
|
||||
response := string(b)
|
||||
if err != nil {
|
||||
return response, fmt.Errorf("error reading load response body: %w", err)
|
||||
|
Reference in New Issue
Block a user