|
@@ -61,12 +61,13 @@ var (
|
|
// driver of the daemon. This is initialized in docker_utils by sending
|
|
// driver of the daemon. This is initialized in docker_utils by sending
|
|
// a version call to the daemon and examining the response header.
|
|
// a version call to the daemon and examining the response header.
|
|
daemonStorageDriver string
|
|
daemonStorageDriver string
|
|
-)
|
|
|
|
|
|
|
|
-const (
|
|
|
|
// WindowsBaseImage is the name of the base image for Windows testing
|
|
// WindowsBaseImage is the name of the base image for Windows testing
|
|
|
|
+ // Environment variable WINDOWS_BASE_IMAGE can override this
|
|
WindowsBaseImage = "windowsservercore"
|
|
WindowsBaseImage = "windowsservercore"
|
|
|
|
+)
|
|
|
|
|
|
|
|
+const (
|
|
// DefaultImage is the name of the base image for the majority of tests that
|
|
// DefaultImage is the name of the base image for the majority of tests that
|
|
// are run across suites
|
|
// are run across suites
|
|
DefaultImage = "busybox"
|
|
DefaultImage = "busybox"
|
|
@@ -128,4 +129,9 @@ func init() {
|
|
}
|
|
}
|
|
volumesConfigPath = dockerBasePath + "/volumes"
|
|
volumesConfigPath = dockerBasePath + "/volumes"
|
|
containerStoragePath = dockerBasePath + "/containers"
|
|
containerStoragePath = dockerBasePath + "/containers"
|
|
|
|
+
|
|
|
|
+ if len(os.Getenv("WINDOWS_BASE_IMAGE")) > 0 {
|
|
|
|
+ WindowsBaseImage = os.Getenv("WINDOWS_BASE_IMAGE")
|
|
|
|
+ fmt.Println("INFO: Windows Base image is ", WindowsBaseImage)
|
|
|
|
+ }
|
|
}
|
|
}
|