From f124bc620f729dc82f7d6ba30220bfbbd4c3b2f5 Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <cyphar@cyphar.com>
Date: Fri, 20 Mar 2015 19:59:15 +1100
Subject: [PATCH] *: switch to Get(Root)?ResourcePath where appropriate

Several parts of the codebase didn't use the correct path sanitisation
wrappers. Now that the wrappers have been exposed, use those.

Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
Upstream-commit: b7c3c0cb6988c9a7864649bfe458217336c5fc51
Component: engine
---
 components/engine/builder/internals.go | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/components/engine/builder/internals.go b/components/engine/builder/internals.go
index ba7d45bcb1..2fe7ca8bad 100644
--- a/components/engine/builder/internals.go
+++ b/components/engine/builder/internals.go
@@ -32,7 +32,6 @@ import (
 	"github.com/docker/docker/pkg/parsers"
 	"github.com/docker/docker/pkg/progressreader"
 	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/pkg/symlink"
 	"github.com/docker/docker/pkg/system"
 	"github.com/docker/docker/pkg/tarsum"
 	"github.com/docker/docker/pkg/urlutil"
@@ -646,14 +645,12 @@ func (b *Builder) addContext(container *daemon.Container, orig, dest string, dec
 		err        error
 		destExists = true
 		origPath   = path.Join(b.contextPath, orig)
-		destPath   = path.Join(container.RootfsPath(), dest)
+		destPath   string
 	)
 
-	if destPath != container.RootfsPath() {
-		destPath, err = symlink.FollowSymlinkInScope(destPath, container.RootfsPath())
-		if err != nil {
-			return err
-		}
+	destPath, err = container.GetResourcePath(dest)
+	if err != nil {
+		return err
 	}
 
 	// Preserve the trailing '/'