From d522584b51b668f0302019aa3954a343bb40f0a8 Mon Sep 17 00:00:00 2001 From: zhogov Date: Fri, 8 Mar 2019 13:59:03 -0500 Subject: [PATCH 1/2] [FIXED JENKINS-56488] Handle quotes in Dockerfile path --- .../org/jenkinsci/plugins/docker/workflow/Docker.groovy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/resources/org/jenkinsci/plugins/docker/workflow/Docker.groovy b/src/main/resources/org/jenkinsci/plugins/docker/workflow/Docker.groovy index 3c8e01a67..31abe6581 100644 --- a/src/main/resources/org/jenkinsci/plugins/docker/workflow/Docker.groovy +++ b/src/main/resources/org/jenkinsci/plugins/docker/workflow/Docker.groovy @@ -86,6 +86,8 @@ class Docker implements Serializable { def arg = parsedArgs[i] if ((arg == '-f' || arg.startsWith('--file')) && i < (parsedArgs.length - 1)) { dockerfile = arg.startsWith('--file=') ? arg.split('=')[1] : parsedArgs[i+1] + // Trim leading and trailing quotes + dockerfile = dockerfile.replaceAll('''^'|'$|^"|"$''', "") break } } From d2a6797bed03b3977378d318f84dcded0e03d98d Mon Sep 17 00:00:00 2001 From: zhogov Date: Wed, 24 Apr 2019 10:53:33 -0400 Subject: [PATCH 2/2] Use regex groups --- .../org/jenkinsci/plugins/docker/workflow/Docker.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/org/jenkinsci/plugins/docker/workflow/Docker.groovy b/src/main/resources/org/jenkinsci/plugins/docker/workflow/Docker.groovy index 31abe6581..02f11b1b3 100644 --- a/src/main/resources/org/jenkinsci/plugins/docker/workflow/Docker.groovy +++ b/src/main/resources/org/jenkinsci/plugins/docker/workflow/Docker.groovy @@ -87,7 +87,7 @@ class Docker implements Serializable { if ((arg == '-f' || arg.startsWith('--file')) && i < (parsedArgs.length - 1)) { dockerfile = arg.startsWith('--file=') ? arg.split('=')[1] : parsedArgs[i+1] // Trim leading and trailing quotes - dockerfile = dockerfile.replaceAll('''^'|'$|^"|"$''', "") + dockerfile = dockerfile.replaceAll(/^('|")(.*)(\1)$/, '$2') break } }