Skip to content

Commit 4c3ff56

Browse files
committed
ci: windows dockerfile used by Jenkins can override image
1 parent b9a01eb commit 4c3ff56

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

vars/runJenkinsPipeline.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ def call(){
510510
script{
511511
def envs = []
512512
node('docker && windows'){
513-
docker.image('python').inside("--mount type=volume,source=uv_python_install_dir,target=${env.UV_PYTHON_INSTALL_DIR}"){
513+
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}"){
514514
try{
515515
checkout scm
516516
bat(script: 'python -m venv venv && venv\\Scripts\\pip install --disable-pip-version-check uv')
@@ -537,7 +537,7 @@ def call(){
537537
"Tox Environment: ${toxEnv}",
538538
{
539539
node('docker && windows'){
540-
docker.image('python').inside("--mount type=volume,source=uv_python_install_dir,target=${env.UV_PYTHON_INSTALL_DIR}"){
540+
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}"){
541541
checkout scm
542542
try{
543543
retry(3){
@@ -680,7 +680,7 @@ def call(){
680680
checkout scm
681681
unstash 'PYTHON_PACKAGES'
682682
if(['linux', 'windows'].contains(entry.OS) && params.containsKey("INCLUDE_${entry.OS}-${entry.ARCHITECTURE}".toUpperCase()) && params["INCLUDE_${entry.OS}-${entry.ARCHITECTURE}".toUpperCase()]){
683-
docker.image('python').inside(isUnix() ? '': "--mount type=volume,source=uv_python_install_dir,target=C:\\Users\\ContainerUser\\Documents\\uvpython"){
683+
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"){
684684
if(isUnix()){
685685
withEnv([
686686
'PIP_CACHE_DIR=/tmp/pipcache',

0 commit comments

Comments
 (0)