2f9b83d720
Most of the code is now on pkg/integration. Signed-off-by: Vincent Demeester <vincent@sbr.pm> Upstream-commit: def13fa23c812d367e3c61d9c39bdcee66929c17 Component: engine
31 lines
732 B
Go
31 lines
732 B
Go
package main
|
|
|
|
import (
|
|
"github.com/docker/docker/pkg/integration/cmd"
|
|
"os/exec"
|
|
)
|
|
|
|
func getPrefixAndSlashFromDaemonPlatform() (prefix, slash string) {
|
|
if daemonPlatform == "windows" {
|
|
return "c:", `\`
|
|
}
|
|
return "", "/"
|
|
}
|
|
|
|
// TODO: update code to call cmd.RunCmd directly, and remove this function
|
|
func runCommandWithOutput(execCmd *exec.Cmd) (string, int, error) {
|
|
result := cmd.RunCmd(transformCmd(execCmd))
|
|
return result.Combined(), result.ExitCode, result.Error
|
|
}
|
|
|
|
// Temporary shim for migrating commands to the new function
|
|
func transformCmd(execCmd *exec.Cmd) cmd.Cmd {
|
|
return cmd.Cmd{
|
|
Command: execCmd.Args,
|
|
Env: execCmd.Env,
|
|
Dir: execCmd.Dir,
|
|
Stdin: execCmd.Stdin,
|
|
Stdout: execCmd.Stdout,
|
|
}
|
|
}
|