Commit graph

61 commits

Author SHA1 Message Date
Martin Jambon 71fe2fd68b Don't mark lone backslashes as escape sequences 2023-06-23 13:12:10 -07:00
Martin Jambon 98fdcad2a0 Add support for single-quoted strings and distinguish JSON strings from
the double-quoted strings that support variable expansion.
2023-06-22 19:44:07 -07:00
Camden Cheek fd30df68c4
Merge pull request #35 from Quitlox/34-capital-in-user-error
Fix error if USER username/group contains capital
2023-05-02 20:19:31 -06:00
Kevin Witlox dd30de55fb Fix error if USER username/group contains capital 2023-05-02 20:54:19 +02:00
Camden Cheek 8ee3a0f758
Merge pull request #28 from returntocorp/mj-run-param
Support options after RUN
2023-02-21 21:09:31 -07:00
Martin Jambon 771fccc7ec Regenerate 2023-02-21 14:40:46 -08:00
Martin Jambon 3b6aaf2303 Merge branch 'main' into mj-run-param 2023-02-21 14:39:57 -08:00
Camden Cheek 09e316dba3
Merge pull request #29 from mattmassicotte/feature/spm
SPM support
2022-12-03 14:21:21 -07:00
Matt 76452728fc
SPM support 2022-12-03 07:44:28 -05:00
Camden Cheek f913be9bb8
Merge pull request #25 from mattmassicotte/feature/make
Makefile
2022-11-05 10:22:31 -06:00
Camden Cheek e808beaf1f
Merge pull request #23 from marciomazza/variables-can-start-or-end-with-underscores
Allow variables to begin or end with underscores
2022-11-05 10:20:01 -06:00
Martin Jambon 7490273613 Add support for options after RUN 2022-10-25 19:48:10 -07:00
Matt 1258425143
Makefile 2022-09-29 08:12:12 -04:00
Marcio Mazza 4e512c60ef Allow variables to begin or end with underscores 2022-09-13 20:27:53 -03:00
Camden Cheek 25c71d6a24
Merge pull request #20 from returntocorp/sticky-tokens
Disallow whitespace in some multi-fragment constructs.
2022-04-05 11:19:43 -06:00
Martin Jambon 1c0b92971c Regenerate 2022-04-04 19:10:55 -07:00
Martin Jambon d8defd6796 Disallow whitespace in some multi-fragment constructs.
This is more correct and more robust when rules are reordered, see
https://github.com/camdencheek/tree-sitter-dockerfile/issues/18 and
https://github.com/camdencheek/tree-sitter-dockerfile/issues/19
2022-04-04 19:08:03 -07:00
Camden Cheek 189b6b1f86
Merge pull request #17 from camdencheek/cc/allow-numeric-users-groups
allow numeric users and groups
2022-03-07 11:05:02 -07:00
Camden Cheek 71ac1e8880
allow numeric users and groups
Previously, users and groups were set to only allow alphabetical first
characters.
2022-03-07 11:02:36 -07:00
Camden Cheek d34a0cebd0
allow one-letter environment variables
This fixes issue #11. Previously, we required environment variable names
to be one ASCII letter followed by one or more characters, but this
makes the following characters optional.
2022-01-27 11:20:14 -07:00
Camden Cheek 4e5f9a0a61
Merge pull request #14 from returntocorp/mj-copy-multiple-files
Allow copying multiple files with ADD/COPY
2022-01-27 11:14:35 -07:00
Martin Jambon fbbf542d58 Regenerate 2022-01-26 14:42:39 -08:00
Martin Jambon 47a922db41 Support multiple files in ADD/COPY instructions
Fixes https://github.com/camdencheek/tree-sitter-dockerfile/issues/12
2022-01-26 14:41:32 -08:00
Camden Cheek 28ac8596ba
add optional leading comment to shell_command
Previously, if a shell command started with a comment line, parsing
would fail because shell_command expected the first line to be a shell
line. This adds an optional comment to the beginning of the
shell_command to handle this correctly.
2022-01-23 12:37:35 -07:00
Camden Cheek 98e201aaf7
Merge pull request #9 from theHamsta/fix-repo-links
docs: fix repository URL in Cargo.toml
2022-01-13 18:12:52 -07:00
Camden Cheek 22bdef3e27
Merge pull request #8 from theHamsta/empty-env
fix: allow empty value for env_pair
2022-01-13 18:12:28 -07:00
Stephan Seitz 07c078936e docs: fix repository in Cargo.toml 2022-01-13 09:55:30 +01:00
Stephan Seitz fca82f8774 Update tree-sitter-cli: 0.19.4 -> 0.20.1 2022-01-13 09:53:10 +01:00
Stephan Seitz 44be8fbf72 fix: allow empty value for env_pair 2022-01-12 22:43:34 +01:00
Camden Cheek dd2673d44c
Merge pull request #7 from returntocorp/mj-from-param
Prevent '--platform=xxx' after 'FROM' from being mistaken for the image name
2022-01-05 20:55:06 -07:00
Martin Jambon edb5613f52 Simplify pattern
Co-authored-by: Camden Cheek <camden@ccheek.com>
2022-01-05 15:29:28 -08:00
Martin Jambon 37f059a2aa Prevent '--platform=xxx' after 'FROM' from being mistaken for the image name 2022-01-05 00:02:15 -08:00
Camden Cheek 7af32bc04a
Merge pull request #6 from returntocorp/mj-explicit-extra
Disambiguate between two kinds of line continuations
2021-12-16 07:47:57 -07:00
Martin Jambon e0fa91d34a Distinguish line continuation that can occur anywhere (in 'extras') from
line continuation in shell command rule so as to know which is which
when recovering a typed tree with ocaml-tree-sitter.
See https://github.com/returntocorp/ocaml-tree-sitter-core/pull/20
2021-12-15 22:31:20 -08:00
Camden Cheek f0b8e67482
match crate version with tag 2021-09-09 08:58:39 -06:00
Camden Cheek df1c7e13a5
update treesitter dependency to 0.20 2021-09-09 08:58:39 -06:00
Camden Cheek e10833bfee
Update README.md 2021-06-29 08:36:36 -06:00
Camden Cheek d4f9099f9a
simplify comment definition 2021-06-20 12:46:57 -06:00
Camden Cheek 23ca71644d
remove unnecessary _non_newline_whitespace 2021-06-20 12:34:59 -06:00
Camden Cheek 63b21914a5
remove unnecessary precedence 2021-06-20 11:57:44 -06:00
Camden Cheek 739747c15a
use line_continuation instead of token literal 2021-06-20 11:55:27 -06:00
Camden Cheek d812f3a7fc
comments must start at beginning of line
Previously, this grammar allowed comments to start partway through
lines, but per the Dockerfile spec, that is not valid.
2021-06-20 11:47:14 -06:00
Camden Cheek b25f86c3b2
Add MIT license 2021-05-11 20:01:30 -06:00
Camden Cheek f3a88aa686
Format grammar.js with prettier 2021-05-11 20:00:07 -06:00
Camden Cheek 6c1ef89aa8
Update highlights 2021-05-11 09:35:05 -06:00
Camden Cheek ccb1df2ef2
Add README 2021-05-11 08:49:53 -06:00
Camden Cheek dfd7ce6b00
Add example 2021-05-11 08:48:53 -06:00
Camden Cheek 3a6c457095
Add support for the CROSS_BUILD instruction set 2021-05-11 08:47:20 -06:00
Camden Cheek 215639ff94
Fix parsing short env vars 2021-05-11 08:19:44 -06:00
Camden Cheek 00c68f09db
Allow square brackets after first character in shell fragment 2021-05-10 21:23:10 -06:00