tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1723 from docker/master_fail 

ignore missing docker-compose cli-plugin, not required for ECS/ACI/Ku…
This commit is contained in:
Nicolas De loof 2021-05-31 17:47:32 +02:00 committed by GitHub
parent 41d5cfd219 8e8122f255
commit 89a1a27f80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
utils/e2e/framework.go
View File

@ -17,7 +17,6 @@
package e2e
import (
"errors"
"fmt"
"io"
"io/ioutil"
@ -31,6 +30,7 @@ import (
"testing"
"time"
"github.com/pkg/errors"
"gotest.tools/v3/assert"
is "gotest.tools/v3/assert/cmp"
"gotest.tools/v3/icmd"
@ -90,10 +90,15 @@ func newE2eCLI(t *testing.T, binDir string) *E2eCLI {
if runtime.GOOS == "windows" {
composePluginFile += ".exe"
}
composePlugin, _ := findExecutable(composePluginFile, []string{"../../bin", "../../../bin"})
err = CopyFile(composePlugin, filepath.Join(d, "cli-plugins", composePluginFile))
if err != nil {
panic(err)
composePlugin, err := findExecutable(composePluginFile, []string{"../../bin", "../../../bin"})
if os.IsNotExist(err) {
fmt.Println("WARNING: docker-compose cli-plugin not found")
}
if err == nil {
err = CopyFile(composePlugin, filepath.Join(d, "cli-plugins", composePluginFile))
if err != nil {
panic(err)
}
}
return &E2eCLI{binDir, d, t}
@ -158,7 +163,7 @@ func findExecutable(executableName string, paths []string) (string, error) {
return bin, nil
}
return "", errors.New("executable not found")
return "", errors.Wrap(os.ErrNotExist, "executable not found")
}
// CopyFile copies a file from a sourceFile to a destinationFile setting permissions to 0755