diff --git a/diff/apply/apply_darwin.go b/diff/apply/apply_darwin.go deleted file mode 100644 index dd93d3107..000000000 --- a/diff/apply/apply_darwin.go +++ /dev/null @@ -1,47 +0,0 @@ -/* - 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/archive" - "github.com/containerd/containerd/mount" -) - -func apply(ctx context.Context, mounts []mount.Mount, r io.Reader) error { - // We currently do not support mounts nor bind mounts on MacOS in the containerd daemon. - // Using this as an exception to enable native snapshotter and allow further research. - if 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 - } - - return mount.WithTempMount(ctx, mounts, func(root string) error { - _, err := archive.Apply(ctx, root, r) - return err - }) -} diff --git a/diff/apply/apply_other.go b/diff/apply/apply_other.go index 3bd79781d..9daa6cc1f 100644 --- a/diff/apply/apply_other.go +++ b/diff/apply/apply_other.go @@ -1,4 +1,4 @@ -//go:build !linux && !darwin +//go:build !linux /* Copyright The containerd Authors.