toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consider WINDOWS_BASE_IMAGE_TAG override when setting Windows base image for tests

Browse Source 
Signed-off-by: Deep Debroy <ddebroy@docker.com>
(cherry picked from commit 15419d7ba09bb48dec59c73af51a0fd005eeb460)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: fed2792d8570d50bb36572286dd84b23dd7fc08d
Component: engine
This commit is contained in:
Deep Debroy
2019-05-21 17:02:37 +02:00
committed by Sebastiaan van Stijn
parent 89a08e8974
commit 2cb70024b7
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/internal/test/environment/environment.go
+6 -3
View File
@@ -75,10 +75,13 @@ func getPlatformDefaults(info types.Info, osType string) PlatformDefaults {
}
case "windows":
baseImage := "microsoft/windowsservercore"
if override := os.Getenv("WINDOWS_BASE_IMAGE"); override != "" {
baseImage = override
fmt.Println("INFO: Windows Base image is ", baseImage)
if overrideBaseImage := os.Getenv("WINDOWS_BASE_IMAGE"); overrideBaseImage != "" {
baseImage = overrideBaseImage
if overrideBaseImageTag := os.Getenv("WINDOWS_BASE_IMAGE_TAG"); overrideBaseImageTag != "" {
baseImage = baseImage + ":" + overrideBaseImageTag
}
}
fmt.Println("INFO: Windows Base image is ", baseImage)
return PlatformDefaults{
BaseImage: baseImage,
VolumesConfigPath: filepath.FromSlash(volumesPath),