Check env var for setting driver in tests

This commit is contained in:
Michael Crosby 2013-11-19 03:13:22 -08:00
parent 6dbeed89c0
commit aea6001baf
1 changed files with 9 additions and 2 deletions

View File

@ -4,6 +4,7 @@ import (
"fmt"
"github.com/dotcloud/docker/archive"
"github.com/dotcloud/docker/utils"
"os"
"path"
)
@ -66,9 +67,15 @@ func New(root string) (Driver, error) {
var driver Driver
var lastError error
if DefaultDriver != "" {
return GetDriver(DefaultDriver, root)
for _, name := range []string{
os.Getenv("DOCKER_DRIVER"),
DefaultDriver,
} {
if name != "" {
return GetDriver(name, root)
}
}
// Check for priority drivers first
for _, name := range priority {
driver, lastError = GetDriver(name, root)