1. docker
  2. Commit a004854097417a591c3f6a3aeaab75efae3c5814
Browse code

Merge pull request #229 from thaJeztah/19.03_backport_windows_tag

[19.03 backport] Consider WINDOWS_BASE_IMAGE_TAG override when setting Windows base image for tests

Sebastiaan van Stijn authored on 2019/05/28 03:07:10
Showing 1 changed files
internal/test/environment/environment.go
History View file @ a004854
... ... 
@@ -78,10 +78,13 @@ func getPlatformDefaults(info types.Info, osType string) PlatformDefaults {
78 78 
 		}
79 79 
 	case "windows":
80 80 
 		baseImage := "microsoft/windowsservercore"
81 
-		if override := os.Getenv("WINDOWS_BASE_IMAGE"); override != "" {
82 
-			baseImage = override
83 
-			fmt.Println("INFO: Windows Base image is ", baseImage)
81 
+		if overrideBaseImage := os.Getenv("WINDOWS_BASE_IMAGE"); overrideBaseImage != "" {
82 
+			baseImage = overrideBaseImage
83 
+			if overrideBaseImageTag := os.Getenv("WINDOWS_BASE_IMAGE_TAG"); overrideBaseImageTag != "" {
84 
+				baseImage = baseImage + ":" + overrideBaseImageTag
85 
+			}
84 86 
 		}
87 
+		fmt.Println("INFO: Windows Base image is ", baseImage)
85 88 
 		return PlatformDefaults{
86 89 
 			BaseImage:            baseImage,
87 90 
 			VolumesConfigPath:    filepath.FromSlash(volumesPath),