mirror of
https://github.com/mudler/luet.git
synced 2025-09-27 23:45:37 +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
16
vendor/github.com/google/go-containerregistry/pkg/v1/tarball/image.go
generated
vendored
16
vendor/github.com/google/go-containerregistry/pkg/v1/tarball/image.go
generated
vendored
@@ -21,13 +21,13 @@ import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"path"
|
||||
"path/filepath"
|
||||
"sync"
|
||||
|
||||
"github.com/google/go-containerregistry/internal/gzip"
|
||||
comp "github.com/google/go-containerregistry/internal/compression"
|
||||
"github.com/google/go-containerregistry/pkg/compression"
|
||||
"github.com/google/go-containerregistry/pkg/name"
|
||||
v1 "github.com/google/go-containerregistry/pkg/v1"
|
||||
"github.com/google/go-containerregistry/pkg/v1/partial"
|
||||
@@ -166,7 +166,13 @@ func (i *image) areLayersCompressed() (bool, error) {
|
||||
return false, err
|
||||
}
|
||||
defer blob.Close()
|
||||
return gzip.Is(blob)
|
||||
|
||||
cp, _, err := comp.PeekCompression(blob)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
|
||||
return cp != compression.None, nil
|
||||
}
|
||||
|
||||
func (i *image) loadTarDescriptorAndConfig() error {
|
||||
@@ -195,7 +201,7 @@ func (i *image) loadTarDescriptorAndConfig() error {
|
||||
}
|
||||
defer cfg.Close()
|
||||
|
||||
i.config, err = ioutil.ReadAll(cfg)
|
||||
i.config, err = io.ReadAll(cfg)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -236,7 +242,7 @@ func extractFileFromTar(opener Opener, filePath string) (io.ReadCloser, error) {
|
||||
if hdr.Name == filePath {
|
||||
if hdr.Typeflag == tar.TypeSymlink || hdr.Typeflag == tar.TypeLink {
|
||||
currentDir := filepath.Dir(filePath)
|
||||
return extractFileFromTar(opener, path.Join(currentDir, hdr.Linkname))
|
||||
return extractFileFromTar(opener, path.Join(currentDir, path.Clean(hdr.Linkname)))
|
||||
}
|
||||
close = false
|
||||
return tarFile{
|
||||
|
Reference in New Issue
Block a user