Improve heredoc parsing to allow more generic shell-words #2213
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
jedevc
force-pushed
the
dockerfile-heredoc-parsing
branch
2 times, most recently
from
3419a68 to
80ccbe1
Compare
|
Woops, missed a spot that the integration tests caught 🎉 The Apologies for all the extra CI runs, I don't seem to be able to cancel them once they get going. |
tonistiigi
reviewed
Jun 30, 2021
jedevc
force-pushed
the
dockerfile-heredoc-parsing
branch
2 times, most recently
from
b226aff to
af08f44
Compare
|
Caught a small issue with quoting in something like Should be a test now for that case. |
tonistiigi
reviewed
Jul 1, 2021
jedevc
force-pushed
the
dockerfile-heredoc-parsing
branch
from
af08f44 to
ec1bfc8
Compare
Previously, heredoc names were restricted to simple alphanumeric strings. However, heredocs should support much more complex use-cases, including quoting anywhere, as well as allowing special symbols like `.` for easily expressing file extensions. This patch adds support for these more complex cases, by using the shell lexer to parse each heredoc name. Additionally, we include improvements to the lexer to optionally preserve escape tokens to avoid problems when lexing words that have already been lexed before. Signed-off-by: Justin Chadwell <me@jedevc.com>
tonistiigi
approved these changes
Jul 1, 2021
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.
Previously, heredoc names have been restricted to simple alphanumeric strings. However, heredocs should support much more complex use-cases, including quoting anywhere, as well as allowing special symbols like
.for easily expressing file extensions.This patch adds support for these more complex cases, by using the shell lexer to parse each heredoc name. Additionally, we include improvements to the lexer to optionally preserve escape tokens to avoid problems when lexing words that have already been lexed before.
Not quite sure how I missed this before in the first iteration, since all shells support some really complex word rules for the naming of heredocs, but now there's some tests to catch these weirder cases. The main one of use is doing something like
COPY <<file.txt /which wasn't possible before (because.wouldn't count as part of the heredoc name).