dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-06-30 19:58:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove uses of deprecated go-archive consts

Browse Source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2025-12-19 17:51:03 +01:00
parent 2142a4444c
commit 7239c72eca
14 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
daemon/graphdriver/fsdiff.go
View File

@@ -8,6 +8,7 @@ import (
"github.com/containerd/log"
"github.com/moby/go-archive"
"github.com/moby/go-archive/chrootarchive"
"github.com/moby/go-archive/compression"
"github.com/moby/moby/v2/pkg/ioutils"
"github.com/moby/sys/user"
)
@@ -64,7 +65,7 @@ func (gdw *NaiveDiffDriver) Diff(id, parent string) (arch io.ReadCloser, retErr
}()
if parent == "" {
tarArchive, err := archive.Tar(layerFs, archive.Uncompressed)
tarArchive, err := archive.Tar(layerFs, compression.None)
if err != nil {
return nil, err
}

3
daemon/graphdriver/overlay2/overlay.go
View File

@@ -19,6 +19,7 @@ import (
"github.com/docker/go-units"
"github.com/moby/go-archive"
"github.com/moby/go-archive/chrootarchive"
"github.com/moby/go-archive/compression"
"github.com/moby/locker"
"github.com/moby/moby/v2/daemon/graphdriver"
"github.com/moby/moby/v2/daemon/graphdriver/overlayutils"
@@ -721,7 +722,7 @@ func (d *Driver) Diff(id, parent string) (io.ReadCloser, error) {
diffPath := d.getDiffPath(id)
logger.Debugf("Tar with options on %s", diffPath)
return archive.TarWithOptions(diffPath, &archive.TarOptions{
Compression: archive.Uncompressed,
Compression: compression.None,
IDMap: d.idMap,
WhiteoutFormat: archive.OverlayWhiteoutFormat,
})