Skip to content
This repository was archived by the owner on Jun 26, 2023. It is now read-only.

Commit e3cf664

Browse files
authored
Merge pull request #25 from portainer/fix/EE-2860/env-in-compose
allow env file to be provided for the removal [EE-2860]
2 parents c597b85 + d5fa9ba commit e3cf664

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

compose/internal/composeplugin/composeplugin.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ func (wrapper *PluginWrapper) Deploy(ctx context.Context, workingDir, host, proj
7777
}
7878

7979
// Down stop and remove containers
80-
func (wrapper *PluginWrapper) Remove(ctx context.Context, workingDir, host, projectName string, filePaths []string) error {
81-
output, err := wrapper.command(newDownCommand(filePaths), workingDir, host, projectName, "")
80+
func (wrapper *PluginWrapper) Remove(ctx context.Context, workingDir, host, projectName string, filePaths []string, envFilePath string) error {
81+
output, err := wrapper.command(newDownCommand(filePaths), workingDir, host, projectName, envFilePath)
8282
if len(output) != 0 {
8383
if err != nil {
8484
return err

libstack.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ import (
66

77
type Deployer interface {
88
Deploy(ctx context.Context, workingDir, host, projectName string, filePaths []string, envFilePath string, forceRereate bool) error
9-
Remove(ctx context.Context, workingDir, host, projectName string, filePaths []string) error
9+
Remove(ctx context.Context, workingDir, host, projectName string, filePaths []string, envFilePath string) error
1010
Pull(ctx context.Context, workingDir, host, projectName string, filePaths []string, envFilePath string) error
1111
}

0 commit comments

Comments
 (0)