Add isolation to info

Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: c4e169727474f24cb0eddea15b94aaa2bfbb3281
Component: engine
This commit is contained in:
John Howard
2016-09-23 12:13:29 -07:00
parent 93e3695b69
commit a034d841ce
8 changed files with 150 additions and 1 deletions
@@ -9,6 +9,7 @@ import (
"path/filepath"
"strconv"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/pkg/reexec"
)
@@ -69,6 +70,9 @@ var (
// Environment variable WINDOWS_BASE_IMAGE can override this
WindowsBaseImage = "windowsservercore"
// isolation is the isolation mode of the daemon under test
isolation container.Isolation
// daemonPid is the pid of the main test daemon
daemonPid int
)
@@ -84,6 +84,7 @@ func init() {
volumesConfigPath = strings.Replace(volumesConfigPath, `\`, `/`, -1)
containerStoragePath = strings.Replace(containerStoragePath, `\`, `/`, -1)
}
isolation = info.Isolation
}
func convertBasesize(basesizeBytes int64) (int64, error) {