revert 51887a3 in favor of mountPaths.appDir()

Signed-off-by: Joe Kutner <[email protected]>
buildpacks · Apr 28, 2021 · 9cc6613 · 9cc6613
1 parent 51887a3
commit 9cc6613
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/internal/build/lifecycle_execution.go b/internal/build/lifecycle_execution.go
@@ -193,7 +193,7 @@ func (l *LifecycleExecution) Create(ctx context.Context, publish bool, dockerHos
 
 	opts := []PhaseConfigProviderOperation{
 		WithFlags(l.withLogLevel(flags...)...),
-		WithArgs("-app", l.mountPaths.appDirName(), repoName),
+		WithArgs("-app", l.mountPaths.appDir(), repoName),
 		WithNetwork(networkMode),
 		cacheOpts,
 		WithContainerOperations(CopyDir(l.opts.AppPath, l.mountPaths.appDir(), l.opts.Builder.UID(), l.opts.Builder.GID(), l.os, l.opts.FileFilter)),
@@ -225,7 +225,7 @@ func (l *LifecycleExecution) Detect(ctx context.Context, networkMode string, vol
 		l,
 		WithLogPrefix("detector"),
 		WithArgs(
-			l.withLogLevel("-app", l.mountPaths.appDirName())...,
+			l.withLogLevel("-app", l.mountPaths.appDir())...,
 		),
 		WithNetwork(networkMode),
 		WithBinds(volumes...),
@@ -357,7 +357,7 @@ func (l *LifecycleExecution) Build(ctx context.Context, networkMode string, volu
 		"builder",
 		l,
 		WithLogPrefix("builder"),
-		WithArgs(l.withLogLevel("-app", l.mountPaths.appDirName())...),
+		WithArgs(l.withLogLevel("-app", l.mountPaths.appDir())...),
 		WithNetwork(networkMode),
 		WithBinds(volumes...),
 	)

diff --git a/internal/build/mount_paths.go b/internal/build/mount_paths.go
@@ -1,9 +1,6 @@
 package build
 
-import (
-	"path"
-	"strings"
-)
+import "strings"
 
 type mountPaths struct {
 	volume    string
@@ -42,7 +39,7 @@ func (m mountPaths) stackPath() string {
 }
 
 func (m mountPaths) appDirName() string {
-	return path.Join(m.separator, m.workspace)
+	return m.workspace
 }
 
 func (m mountPaths) appDir() string {