Merge pull request #80 from UIUCLibrary/fix-ci

ci: windows dockerfile used to build Chocolatey can override image

Author: henryborchers

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';"]
 

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{
@@ -796,7 +796,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{