feat(compose): added envFilePath parameter.

fhanportainer · fhanportainer · commit f05c95f44dc9 · 2022-05-11T23:39:18.000+12:00
diff --git a/compose/internal/composeplugin/composeplugin.go b/compose/internal/composeplugin/composeplugin.go
@@ -92,8 +92,8 @@ func (wrapper *PluginWrapper) Remove(ctx context.Context, workingDir, host, proj
 }
 
 // Pull images
-func (wrapper *PluginWrapper) Pull(ctx context.Context, workingDir, host, projectName string, filePaths []string) error {
-	output, err := wrapper.command(newPullCommand(filePaths), workingDir, host, projectName, "")
+func (wrapper *PluginWrapper) Pull(ctx context.Context, workingDir, host, projectName string, filePaths []string, envFilePath string) error {
+	output, err := wrapper.command(newPullCommand(filePaths), workingDir, host, projectName, envFilePath)
 	if len(output) != 0 {
 		if err != nil {
 			return err
@@ -171,7 +171,6 @@ func newUpCommand(filePaths []string, forceRereate bool) composeCommand {
 	return newCommand(args, filePaths)
 }
 
-
 func newDownCommand(filePaths []string) composeCommand {
 	return newCommand([]string{"down", "--remove-orphans"}, filePaths)
 }
diff --git a/libstack.go b/libstack.go
@@ -7,5 +7,5 @@ import (
 type Deployer interface {
 	Deploy(ctx context.Context, workingDir, host, projectName string, filePaths []string, envFilePath string, forceRereate bool) error
 	Remove(ctx context.Context, workingDir, host, projectName string, filePaths []string) error
-	Pull(ctx context.Context, workingDir, host, projectName string, filePaths []string) error
+	Pull(ctx context.Context, workingDir, host, projectName string, filePaths []string, envFilePath string) error
 }

Original file line number	Diff line number	Diff line change
`@@ -92,8 +92,8 @@ func (wrapper *PluginWrapper) Remove(ctx context.Context, workingDir, host, proj`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`// Pull images`
`95`		`-func (wrapper *PluginWrapper) Pull(ctx context.Context, workingDir, host, projectName string, filePaths []string) error {`
`96`		`- output, err := wrapper.command(newPullCommand(filePaths), workingDir, host, projectName, "")`
	`95`	`+func (wrapper *PluginWrapper) Pull(ctx context.Context, workingDir, host, projectName string, filePaths []string, envFilePath string) error {`
	`96`	`+ output, err := wrapper.command(newPullCommand(filePaths), workingDir, host, projectName, envFilePath)`
`97`	`97`	`if len(output) != 0 {`
`98`	`98`	`if err != nil {`
`99`	`99`	`return err`
`@@ -171,7 +171,6 @@ func newUpCommand(filePaths []string, forceRereate bool) composeCommand {`
`171`	`171`	`return newCommand(args, filePaths)`
`172`	`172`	`}`
`173`	`173`
`174`		`-`
`175`	`174`	`func newDownCommand(filePaths []string) composeCommand {`
`176`	`175`	`return newCommand([]string{"down", "--remove-orphans"}, filePaths)`
`177`	`176`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,5 @@ import (`
`7`	`7`	`type Deployer interface {`
`8`	`8`	`Deploy(ctx context.Context, workingDir, host, projectName string, filePaths []string, envFilePath string, forceRereate bool) error`
`9`	`9`	`Remove(ctx context.Context, workingDir, host, projectName string, filePaths []string) error`
`10`		`- Pull(ctx context.Context, workingDir, host, projectName string, filePaths []string) error`
	`10`	`+ Pull(ctx context.Context, workingDir, host, projectName string, filePaths []string, envFilePath string) error`
`11`	`11`	`}`