dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-07-24 16:26:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #46413 from thaJeztah/builder_diffid_type

Browse Source 
daemon/containerd: use "DiffID" type for diff fields
This commit is contained in:
Sebastiaan van Stijn
2023-09-12 10:08:46 +02:00
committed by GitHub
parent 75308e471c 4229032676
commit 4f28802f09
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
daemon/containerd/image_builder.go
View File

@@ -229,7 +229,7 @@ type rolayer struct {
key string
c *containerd.Client
snapshotter string
diffID digest.Digest
diffID layer.DiffID
contentStoreDigest digest.Digest
lease *leases.Lease
}
@@ -242,7 +242,7 @@ func (rl *rolayer) DiffID() layer.DiffID {
if rl.diffID == "" {
return layer.DigestSHA256EmptyTar
}
return layer.DiffID(rl.diffID)
return rl.diffID
}
func (rl *rolayer) Release() error {
@@ -356,7 +356,7 @@ func (rw *rwlayer) Commit() (_ builder.ROLayer, outErr error) {
key: key,
c: rw.c,
snapshotter: rw.snapshotter,
diffID: diffID,
diffID: layer.DiffID(diffID),
contentStoreDigest: desc.Digest,
lease: &lease,
}, nil