瀏覽代碼

Merge pull request #34294 from AkihiroSuda/improve-it-on-swarm

integration-cli-on-swarm: print detailed error
Brian Goff 8 年之前
父節點
當前提交
b6d164e6c4
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      hack/integration-cli-on-swarm/host/dockercmd.go

+ 1 - 1
hack/integration-cli-on-swarm/host/dockercmd.go

@@ -43,7 +43,7 @@ func deployStack(unusedCli *client.Client, stackName, composeFilePath string) er
 
 func hasStack(unusedCli *client.Client, stackName string) bool {
 	// FIXME: eliminate os/exec (but stack is implemented in CLI ...)
-	out, err := exec.Command("docker", "stack", "ls").Output()
+	out, err := exec.Command("docker", "stack", "ls").CombinedOutput()
 	if err != nil {
 		panic(fmt.Errorf("`docker stack ls` failed with: %s", string(out)))
 	}