ci(jenkins): delegate docker setup to the preCommit step (#558)

v1v · web-flow · commit 1e0f26e395e9 · 2019-08-14T11:24:16.000+01:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -70,10 +70,8 @@ pipeline {
               deleteDir()
               unstash 'source'
               script {
-                docker.image('python:3.7-stretch').inside("-e PATH=${PATH}:${env.WORKSPACE}/bin"){
-                  dir("${BASE_DIR}"){
-                    preCommit(commit: "${GIT_BASE_COMMIT}", junit: true)
-                  }
+                dir(BASE_DIR){
+                  preCommit(commit: "${GIT_BASE_COMMIT}", junit: true, dockerImage: 'python:3.7-stretch')
                 }
               }
             }

Original file line number	Diff line number	Diff line change
`@@ -70,10 +70,8 @@ pipeline {`
`70`	`70`	`deleteDir()`
`71`	`71`	`unstash 'source'`
`72`	`72`	`script {`
`73`		`- docker.image('python:3.7-stretch').inside("-e PATH=${PATH}:${env.WORKSPACE}/bin"){`
`74`		`- dir("${BASE_DIR}"){`
`75`		`- preCommit(commit: "${GIT_BASE_COMMIT}", junit: true)`
`76`		`- }`
	`73`	`+ dir(BASE_DIR){`
	`74`	`+ preCommit(commit: "${GIT_BASE_COMMIT}", junit: true, dockerImage: 'python:3.7-stretch')`
`77`	`75`	`}`
`78`	`76`	`}`
`79`	`77`	`}`