Merge pull request #13 from portainer/feat-use-working-dir

feat: allow to specify a working directory for a compose

Author: DimaSalakhov

go.mod

@@ -1,3 +1,5 @@
 module github.com/portainer/docker-compose-wrapper
 
-go 1.15
+go 1.16
+
+require github.com/pkg/errors v0.9.1

go.sum

@@ -0,0 +1,2 @@
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

wrapper.go

@@ -2,11 +2,12 @@ package wrapper
 
 import (
 	"bytes"
-	"errors"
 	"fmt"
 	"os"
 	"os/exec"
 	"strings"
+
+	"github.com/pkg/errors"
 )
 
 var (
@@ -29,17 +30,17 @@ func NewComposeWrapper(binaryPath string) (*ComposeWrapper, error) {
 }
 
 // Up create and start containers
-func (wrapper *ComposeWrapper) Up(filePaths []string, url, projectName, envFilePath, configPath string) ([]byte, error) {
-	return wrapper.Command(newUpCommand(filePaths), url, projectName, envFilePath, configPath)
+func (wrapper *ComposeWrapper) Up(filePaths []string, projectDir, host, projectName, envFilePath, configPath string) ([]byte, error) {
+	return wrapper.Command(newUpCommand(filePaths), projectDir, host, projectName, envFilePath, configPath)
 }
 
 // Down stop and remove containers
-func (wrapper *ComposeWrapper) Down(filePaths []string, url, projectName string) ([]byte, error) {
-	return wrapper.Command(newDownCommand(filePaths), url, projectName, "", "")
+func (wrapper *ComposeWrapper) Down(filePaths []string, projectDir string, host, projectName string) ([]byte, error) {
+	return wrapper.Command(newDownCommand(filePaths), projectDir, host, projectName, "", "")
 }
 
 // Command exectue a docker-compose commanåd
-func (wrapper *ComposeWrapper) Command(command composeCommand, url, projectName, envFilePath, configPath string) ([]byte, error) {
+func (wrapper *ComposeWrapper) Command(command composeCommand, workingDir, host, projectName, envFilePath, configPath string) ([]byte, error) {
 	program := programPath(wrapper.binaryPath, "docker-compose")
 
 	if projectName != "" {
@@ -50,12 +51,13 @@ func (wrapper *ComposeWrapper) Command(command composeCommand, url, projectName,
 		command.WithEnvFilePath(envFilePath)
 	}
 
-	if url != "" {
-		command.WithURL(url)
+	if host != "" {
+		command.WithHost(host)
 	}
 
 	var stderr bytes.Buffer
 	cmd := exec.Command(program, command.ToArgs()...)
+	cmd.Dir = workingDir
 
 	if configPath != "" {
 		cmd.Env = os.Environ()
@@ -66,7 +68,7 @@ func (wrapper *ComposeWrapper) Command(command composeCommand, url, projectName,
 
 	output, err := cmd.Output()
 	if err != nil {
-		return nil, errors.New(stderr.String())
+		return nil, errors.Wrap(err, stderr.String())
 	}
 
 	return output, nil
@@ -105,8 +107,8 @@ func (command *composeCommand) WithEnvFilePath(envFilePath string) {
 	command.args = append(command.args, "--env-file", envFilePath)
 }
 
-func (command *composeCommand) WithURL(url string) {
-	command.args = append(command.args, "-H", url)
+func (command *composeCommand) WithHost(host string) {
+	command.args = append(command.args, "-H", host)
 }
 
 func (command *composeCommand) ToArgs() []string {

wrapper_test.go

@@ -75,7 +75,7 @@ services:
 		t.Fatal(err)
 	}
 
-	_, err = w.Up([]string{filePathOriginal, filePathOverride}, "", "test1", "", "")
+	_, err = w.Up([]string{filePathOriginal, filePathOverride}, "", "", "test1", "", "")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -84,7 +84,7 @@ services:
 		t.Fatal("container should exist")
 	}
 
-	_, err = w.Down([]string{filePathOriginal, filePathOverride}, "", "test1")
+	_, err = w.Down([]string{filePathOriginal, filePathOverride}, "", "", "test1")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -94,13 +94,6 @@ services:
 	}
 }
 
-type composeOptions struct {
-	filePath    string
-	url         string
-	envFile     string
-	projectName string
-}
-
 func createFile(dir, fileName, content string) (string, error) {
 	filePath := filepath.Join(dir, fileName)
 	f, err := os.Create(filePath)
@@ -114,14 +107,6 @@ func createFile(dir, fileName, content string) (string, error) {
 	return filePath, nil
 }
 
-func createEnvFile(dir, envFileContent string) (string, error) {
-	return createFile(dir, "stack.env", envFileContent)
-}
-
-func createComposeFile(dir, composeFileContent string) (string, error) {
-	return createFile(dir, "docmer-compose.yml", composeFileContent)
-}
-
 func containerExists(containerName string) bool {
 	cmd := exec.Command("docker", "ps", "-a", "-f", fmt.Sprintf("name=%s", containerName))