kairos/luet
1
0
Fork 0
mirror of https://github.com/mudler/luet.git synced 2025-09-23 20:18:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

🔧 Update modules

Browse Source
This commit is contained in:
Ettore Di Giacinto
2021-12-28 18:56:13 +01:00
parent 196cdc5cfc
commit 96aaf5235b
355 changed files with 10547 additions and 4907 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/github.com/google/go-containerregistry/pkg/v1/tarball/image.go generated vendored
View File

@@ -227,7 +227,7 @@ func extractFileFromTar(opener Opener, filePath string) (io.ReadCloser, error) {
tf := tar.NewReader(f)
for {
hdr, err := tf.Next()
if err == io.EOF {
if errors.Is(err, io.EOF) {
break
}
if err != nil {

28
vendor/github.com/google/go-containerregistry/pkg/v1/tarball/write.go generated vendored
View File

@@ -98,7 +98,7 @@ func MultiRefWrite(refToImage map[name.Reference]v1.Image, w io.Writer, opts ...
}
}
size, _, mBytes, err := getSizeAndManifest(refToImage)
size, mBytes, err := getSizeAndManifest(refToImage)
if err != nil {
return sendUpdateReturn(o, err)
}
@@ -290,25 +290,25 @@ func calculateManifest(refToImage map[name.Reference]v1.Image) (m Manifest, err
// CalculateSize calculates the expected complete size of the output tar file
func CalculateSize(refToImage map[name.Reference]v1.Image) (size int64, err error) {
size, _, _, err = getSizeAndManifest(refToImage)
size, _, err = getSizeAndManifest(refToImage)
return size, err
}
func getSizeAndManifest(refToImage map[name.Reference]v1.Image) (size int64, m Manifest, mBytes []byte, err error) {
m, err = calculateManifest(refToImage)
func getSizeAndManifest(refToImage map[name.Reference]v1.Image) (int64, []byte, error) {
m, err := calculateManifest(refToImage)
if err != nil {
return 0, nil, nil, fmt.Errorf("unable to calculate manifest: %v", err)
return 0, nil, fmt.Errorf("unable to calculate manifest: %w", err)
}
mBytes, err = json.Marshal(m)
mBytes, err := json.Marshal(m)
if err != nil {
return 0, nil, nil, fmt.Errorf("could not marshall manifest to bytes: %v", err)
return 0, nil, fmt.Errorf("could not marshall manifest to bytes: %w", err)
}
size, err = calculateTarballSize(refToImage, mBytes)
size, err := calculateTarballSize(refToImage, mBytes)
if err != nil {
return 0, nil, nil, fmt.Errorf("error calculating tarball size: %v", err)
return 0, nil, fmt.Errorf("error calculating tarball size: %w", err)
}
return size, m, mBytes, nil
return size, mBytes, nil
}
// calculateTarballSize calculates the size of the tar file
@@ -318,7 +318,7 @@ func calculateTarballSize(refToImage map[name.Reference]v1.Image, mBytes []byte)
for img, name := range imageToTags {
manifest, err := img.Manifest()
if err != nil {
return size, fmt.Errorf("unable to get manifest for img %s: %v", name, err)
return size, fmt.Errorf("unable to get manifest for img %s: %w", name, err)
}
size += calculateSingleFileInTarSize(manifest.Config.Size)
for _, l := range manifest.Layers {
@@ -354,10 +354,8 @@ func dedupRefToImage(refToImage map[name.Reference]v1.Image) map[v1.Image][]stri
ts = fmt.Sprintf("%s:%s", ts, name.DefaultTag)
}
imageToTags[img] = append(imageToTags[img], ts)
} else {
if _, ok := imageToTags[img]; !ok {
imageToTags[img] = nil
}
} else if _, ok := imageToTags[img]; !ok {
imageToTags[img] = nil
}
}