From 844ca49743085afbbab357e1b2b74eca80fcb37c Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 20 Jan 2024 01:27:07 +0100 Subject: [PATCH] pkg/containerfs: remove deprecated ResolveScopedPath This function was deprecated in b8f2caa80ab9a412e53e207de89cc1181aee6516 (v25.0), and is no longer in use. Signed-off-by: Sebastiaan van Stijn --- pkg/containerfs/containerfs.go | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/pkg/containerfs/containerfs.go b/pkg/containerfs/containerfs.go index f71bb036c7..3b7fd80f28 100644 --- a/pkg/containerfs/containerfs.go +++ b/pkg/containerfs/containerfs.go @@ -1,10 +1,6 @@ package containerfs // import "github.com/docker/docker/pkg/containerfs" -import ( - "path/filepath" - - "github.com/moby/sys/symlink" -) +import "path/filepath" // CleanScopedPath prepares the given path to be combined with a mount path or // a drive-letter. On Windows, it removes any existing driveletter (e.g. "C:"). @@ -17,11 +13,3 @@ func CleanScopedPath(path string) string { } return filepath.Join(string(filepath.Separator), path) } - -// ResolveScopedPath evaluates the given path scoped to the root. -// For example, if root=/a, and path=/b/c, then this function would return /a/b/c. -// -// Deprecated: use [symlink.FollowSymlinkInScope]. -func ResolveScopedPath(root, path string) (string, error) { - return symlink.FollowSymlinkInScope(filepath.Join(root, path), root) -}