mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #24853 from Microsoft/jjh/nanoserver
Windows: Allow nanoserver image for CLI
This commit is contained in:
commit
4b7a83dbce
1 changed files with 9 additions and 3 deletions
|
@ -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
|
||||||
|
|
||||||
|
// WindowsBaseImage is the name of the base image for Windows testing
|
||||||
|
// Environment variable WINDOWS_BASE_IMAGE can override this
|
||||||
|
WindowsBaseImage = "windowsservercore"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
// WindowsBaseImage is the name of the base image for Windows testing
|
|
||||||
WindowsBaseImage = "windowsservercore"
|
|
||||||
|
|
||||||
// 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)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue