[FIXED JENKINS-56488] Handle quotes in Dockerfile path #164
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dwnusbaum
reviewed
Apr 24, 2019
There was a problem hiding this comment.
Thanks for the PR! Can you please add a regression test to DockerDSLTest along the lines of DockerDSLTest.build() specifically for a Dockerfile with spaces in it?
| @@ -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('''^'|'$|^"|"$''', "") | |||
There was a problem hiding this comment.
I think it would be a little clearer to use a / string. Also, do we need to make sure we don't trim mismatched quotes like 'foo"? Maybe better to use something like this:
Suggested change
| dockerfile = dockerfile.replaceAll('''^'|'$|^"|"$''', "") | |
| dockerfile = dockerfile.replaceAll(/^('|")(.*)(\1)$/, "$2") |
zhogov
commented
Apr 24, 2019
src/main/resources/org/jenkinsci/plugins/docker/workflow/Docker.groovy
Outdated
Show resolved
Hide resolved
|
I suspect this has already been fixed and so this PR can be closed @rsandell? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.