diff options
| author | Deep Debroy <ddebroy@docker.com> | 2019-05-14 13:27:18 -0700 |
|---|---|---|
| committer | Deep Debroy <ddebroy@docker.com> | 2019-05-14 13:27:18 -0700 |
| commit | 15419d7ba09bb48dec59c73af51a0fd005eeb460 (patch) | |
| tree | 6f9ee3b3936b1c1765f827ec5c4f809d4812aea9 /internal | |
| parent | 8861376202a3b35ca02eb9bae60c3d76443e7e88 (diff) | |
| download | docker-15419d7ba09bb48dec59c73af51a0fd005eeb460.tar.gz | |
Consider WINDOWS_BASE_IMAGE_TAG override when setting Windows base image for tests
Signed-off-by: Deep Debroy <ddebroy@docker.com>
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/test/environment/environment.go | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/internal/test/environment/environment.go b/internal/test/environment/environment.go index 828c94d23f..9bec84483f 100644 --- a/internal/test/environment/environment.go +++ b/internal/test/environment/environment.go @@ -78,10 +78,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), |