Skip to content

Commit a67a968

Browse files
Merge pull request #81 from UIUCLibrary/dev
ci: windows dockerfile used by Jenkins can override image
2 parents 7020c40 + 7ae2725 commit a67a968

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

vars/runJenkinsPipeline.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ def call(){
315315
script{
316316
def envs = []
317317
node('docker && windows'){
318-
docker.image('python').inside("--mount type=volume,source=uv_python_install_dir,target=${env.UV_PYTHON_INSTALL_DIR}"){
318+
docker.image(env.DEFAULT_PYTHON_DOCKER_IMAGE ? env.DEFAULT_PYTHON_DOCKER_IMAGE: 'python').inside("--mount type=volume,source=uv_python_install_dir,target=${env.UV_PYTHON_INSTALL_DIR}"){
319319
try{
320320
checkout scm
321321
bat(script: 'python -m venv venv && venv\\Scripts\\pip install --disable-pip-version-check uv')
@@ -342,7 +342,7 @@ def call(){
342342
"Tox Environment: ${toxEnv}",
343343
{
344344
node('docker && windows'){
345-
docker.image('python').inside("--mount type=volume,source=uv_python_install_dir,target=${env.UV_PYTHON_INSTALL_DIR}"){
345+
docker.image(env.DEFAULT_PYTHON_DOCKER_IMAGE ? env.DEFAULT_PYTHON_DOCKER_IMAGE: 'python').inside("--mount type=volume,source=uv_python_install_dir,target=${env.UV_PYTHON_INSTALL_DIR}"){
346346
checkout scm
347347
try{
348348
bat(label: 'Install uv',
@@ -482,7 +482,7 @@ def call(){
482482
checkout scm
483483
unstash 'PYTHON_PACKAGES'
484484
if(['linux', 'windows'].contains(entry.OS) && params.containsKey("INCLUDE_${entry.OS}-${entry.ARCHITECTURE}".toUpperCase()) && params["INCLUDE_${entry.OS}-${entry.ARCHITECTURE}".toUpperCase()]){
485-
docker.image('python').inside(isUnix() ? '': "--mount type=volume,source=uv_python_install_dir,target=C:\\Users\\ContainerUser\\Documents\\uvpython"){
485+
docker.image(env.DEFAULT_PYTHON_DOCKER_IMAGE ? env.DEFAULT_PYTHON_DOCKER_IMAGE: 'python').inside(isUnix() ? '': "--mount type=volume,source=uv_python_install_dir,target=C:\\Users\\ContainerUser\\Documents\\uvpython"){
486486
if(isUnix()){
487487
withEnv([
488488
'PIP_CACHE_DIR=/tmp/pipcache',

0 commit comments

Comments
 (0)