Merge pull request moby#230 from thaJeztah/18.09_backport_windows_tag

[18.09 backport] Consider WINDOWS_BASE_IMAGE_TAG override when setting Windows base image for tests
thaJeztah · Jun 18, 2019 · bb54c5b · bb54c5b
2 parents 41fbd15 + fed2792
commit bb54c5b
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/internal/test/environment/environment.go b/internal/test/environment/environment.go
@@ -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),