Merge pull request #406 from mikeparker/fix-attachments

Fix attachments on deploy by switching the working directory

Author: mnottale

cmd/docker-app/deploy.go

@@ -1,6 +1,8 @@
 package main
 
 import (
+	"os"
+
 	"github.com/docker/app/internal"
 	"github.com/docker/app/internal/packager"
 	"github.com/docker/app/render"
@@ -75,6 +77,11 @@ func runDeploy(dockerCli command.Cli, flags *pflag.FlagSet, appname string, opts
 	if stackName == "" {
 		stackName = internal.AppNameFromDir(app.Name)
 	}
+	if app.Source.ShouldRunInsideDirectory() {
+		if err := os.Chdir(app.Path); err != nil {
+			return err
+		}
+	}
 	return stack.RunDeploy(dockerCli, flags, rendered, deployOrchestrator, options.Deploy{
 		Namespace:        stackName,
 		ResolveImage:     swarm.ResolveImageAlways,

types/types.go

@@ -32,6 +32,11 @@ const (
 	AppSourceArchive
 )
 
+// ShouldRunInsideDirectory returns whether the package is run from a directory on disk
+func (a AppSourceKind) ShouldRunInsideDirectory() bool {
+	return a == AppSourceSplit || a == AppSourceImage || a == AppSourceArchive
+}
+
 // App represents an app
 type App struct {
 	Name    string