github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #7478 from AkihiroSuda/archive-whiteout-source-date-epoch

Browse Source 
archive: add WithSourceDateEpoch() for whiteouts
This commit is contained in:
Phil Estes
2022-10-10 15:45:25 -07:00
committed by GitHub
parent e61539ae84 70fbedc217
commit cef99bea26
13 changed files with 390 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/ctr/commands/snapshots/snapshots.go
View File

@@ -31,6 +31,7 @@ import (
"github.com/containerd/containerd/diff"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/mount"
"github.com/containerd/containerd/pkg/epoch"
"github.com/containerd/containerd/pkg/progress"
"github.com/containerd/containerd/rootfs"
"github.com/containerd/containerd/snapshots"
@@ -142,6 +143,14 @@ var diffCommand = cli.Command{
diff.WithLabels(labels),
}
ep, err := epoch.SourceDateEpoch()
if err != nil {
return err
}
if ep != nil {
opts = append(opts, diff.WithSourceDateEpoch(ep))
}
if idB == "" {
desc, err = rootfs.CreateDiff(ctx, idA, snapshotter, client.DiffService(), opts...)
if err != nil {