ci: windows dockerfile used to build Chocolatey can override image

henryborchers · henryborchers · commit 9cb7eed86f09 · 2025-03-26T08:39:11.000-05:00
diff --git a/ci/docker/chocolatey_package/Dockerfile b/ci/docker/chocolatey_package/Dockerfile
@@ -1,5 +1,7 @@
 # escape=`
-FROM mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019
+ARG FROM_IMAGE=mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019
+
+FROM ${FROM_IMAGE}
 #FROM mcr.microsoft.com/windows/servercore:ltsc2019 as choco_builder
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
 
diff --git a/vars/runJenkinsPipeline.groovy b/vars/runJenkinsPipeline.groovy
@@ -763,7 +763,7 @@ def call(){
                                     dockerfile {
                                         filename 'ci/docker/chocolatey_package/Dockerfile'
                                         label 'windows && docker && x86'
-                                        additionalBuildArgs '--build-arg CHOCOLATEY_SOURCE'
+                                        additionalBuildArgs '--build-arg CHOCOLATEY_SOURCE --build-arg FROM_IMAGE=%DEFAULT_DOCKER_DOTNET_SDK_BASE_IMAGE%'
                                       }
                                 }
                                 steps{

Original file line number	Diff line number	Diff line change
`@@ -763,7 +763,7 @@ def call(){`
`763`	`763`	`dockerfile {`
`764`	`764`	`filename 'ci/docker/chocolatey_package/Dockerfile'`
`765`	`765`	`label 'windows && docker && x86'`
`766`		`- additionalBuildArgs '--build-arg CHOCOLATEY_SOURCE'`
	`766`	`+ additionalBuildArgs '--build-arg CHOCOLATEY_SOURCE --build-arg FROM_IMAGE=%DEFAULT_DOCKER_DOTNET_SDK_BASE_IMAGE%'`
`767`	`767`	`}`
`768`	`768`	`}`
`769`	`769`	`steps{`