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

Call temp mounts and unmount in containerd server

Browse Source 
Fixes #2004

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby
2018-02-07 11:16:15 -05:00
parent bc974a7a32
commit b2ec177bb2
8 changed files with 78 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
diff/apply/apply.go
View File

@@ -56,7 +56,7 @@ func (s *fsApplier) Apply(ctx context.Context, desc ocispec.Descriptor, mounts [
}
var ocidesc ocispec.Descriptor
if err := mount.DefaultTempLocation.Mount(ctx, mounts, func(root string) error {
if err := mount.WithTempMount(ctx, mounts, func(root string) error {
ra, err := s.store.ReaderAt(ctx, desc.Digest)
if err != nil {
return errors.Wrap(err, "failed to get reader from content store")

4
diff/walking/differ.go
View File

@@ -62,8 +62,8 @@ func (s *walkingDiff) Compare(ctx context.Context, lower, upper []mount.Mount, o
}
var ocidesc ocispec.Descriptor
if err := mount.DefaultTempLocation.Mount(ctx, lower, func(lowerRoot string) error {
return mount.DefaultTempLocation.Mount(ctx, upper, func(upperRoot string) error {
if err := mount.WithTempMount(ctx, lower, func(lowerRoot string) error {
return mount.WithTempMount(ctx, upper, func(upperRoot string) error {
var newReference bool
if config.Reference == "" {
newReference = true