Merged jenkinsci#64: detect custom docker file when using --file.

jglick · jglick · commit 45769c7310e7 · 2016-12-08T17:33:31.000-05:00
diff --git a/src/main/resources/org/jenkinsci/plugins/docker/workflow/Docker.groovy b/src/main/resources/org/jenkinsci/plugins/docker/workflow/Docker.groovy
@@ -80,7 +80,7 @@ class Docker implements Serializable {
             // Detect custom Dockerfile:
             def dockerfile = "${dir}/Dockerfile"
             for (int i=0; i<parsedArgs.length; i++) {
-                if (parsedArgs[i] == '-f' && i < (parsedArgs.length - 1)) {
+                if ((parsedArgs[i] == '-f' || parsedArgs[i] == '--file') && i < (parsedArgs.length - 1)) {
                     dockerfile = parsedArgs[i+1]
                     break
                 }

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ class Docker implements Serializable {`
`80`	`80`	`// Detect custom Dockerfile:`
`81`	`81`	`def dockerfile = "${dir}/Dockerfile"`
`82`	`82`	`for (int i=0; i<parsedArgs.length; i++) {`
`83`		`- if (parsedArgs[i] == '-f' && i < (parsedArgs.length - 1)) {`
	`83`	`+ if ((parsedArgs[i] == '-f' \|\| parsedArgs[i] == '--file') && i < (parsedArgs.length - 1)) {`
`84`	`84`	`dockerfile = parsedArgs[i+1]`
`85`	`85`	`break`
`86`	`86`	`}`