After these changes, in order to add Darwin bind-mount implementation, one only needs: * Adjust HasBindMounts definition in mount.go * Provide implementation in mount_darwin.go There was no consensus on adding dependency on bindfs, that seems to be the only working solution for bind-mounts on Darwin as of today, in https://github.com/containerd/containerd/pull/8789, that's why the actual implementation is not added in current PR. As a bonus, Linux FUSE-related code was moved to a separate file and possibly could be reused on FreeBSD, though this needs testing. Signed-off-by: Marat Radchenko <marat@slonopotamus.org>
		
			
				
	
	
		
			52 lines
		
	
	
		
			1.3 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			52 lines
		
	
	
		
			1.3 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
//go:build !linux
 | 
						|
 | 
						|
/*
 | 
						|
   Copyright The containerd Authors.
 | 
						|
 | 
						|
   Licensed under the Apache License, Version 2.0 (the "License");
 | 
						|
   you may not use this file except in compliance with the License.
 | 
						|
   You may obtain a copy of the License at
 | 
						|
 | 
						|
       http://www.apache.org/licenses/LICENSE-2.0
 | 
						|
 | 
						|
   Unless required by applicable law or agreed to in writing, software
 | 
						|
   distributed under the License is distributed on an "AS IS" BASIS,
 | 
						|
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 | 
						|
   See the License for the specific language governing permissions and
 | 
						|
   limitations under the License.
 | 
						|
*/
 | 
						|
 | 
						|
package apply
 | 
						|
 | 
						|
import (
 | 
						|
	"context"
 | 
						|
	"io"
 | 
						|
	"os"
 | 
						|
 | 
						|
	"github.com/containerd/containerd/v2/core/mount"
 | 
						|
	"github.com/containerd/containerd/v2/pkg/archive"
 | 
						|
)
 | 
						|
 | 
						|
func apply(ctx context.Context, mounts []mount.Mount, r io.Reader, _sync bool) error {
 | 
						|
	// TODO: for windows, how to sync?
 | 
						|
 | 
						|
	if !mount.HasBindMounts && len(mounts) == 1 && mounts[0].Type == "bind" {
 | 
						|
		opts := []archive.ApplyOpt{}
 | 
						|
 | 
						|
		if os.Getuid() != 0 {
 | 
						|
			opts = append(opts, archive.WithNoSameOwner())
 | 
						|
		}
 | 
						|
 | 
						|
		path := mounts[0].Source
 | 
						|
		_, err := archive.Apply(ctx, path, r, opts...)
 | 
						|
		return err
 | 
						|
 | 
						|
		// TODO: Do we need to sync all the filesystems?
 | 
						|
	}
 | 
						|
 | 
						|
	return mount.WithTempMount(ctx, mounts, func(root string) error {
 | 
						|
		_, err := archive.Apply(ctx, root, r)
 | 
						|
		return err
 | 
						|
	})
 | 
						|
}
 |