diff options
| -rw-r--r-- | pygments/lexers/configs.py | 7 | ||||
| -rw-r--r-- | tests/examplefiles/docker.docker | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/pygments/lexers/configs.py b/pygments/lexers/configs.py index 6540615a..19d8c029 100644 --- a/pygments/lexers/configs.py +++ b/pygments/lexers/configs.py @@ -517,7 +517,7 @@ class DockerLexer(RegexLexer): filenames = ['Dockerfile', '*.docker'] mimetypes = ['text/x-dockerfile-config'] - _keywords = (r'(?:FROM|MAINTAINER|RUN|CMD|EXPOSE|ENV|ADD|ENTRYPOINT|' + _keywords = (r'(?:FROM|MAINTAINER|CMD|EXPOSE|ENV|ADD|ENTRYPOINT|' r'VOLUME|WORKDIR)') flags = re.IGNORECASE | re.MULTILINE @@ -526,8 +526,9 @@ class DockerLexer(RegexLexer): 'root': [ (r'^(ONBUILD)(\s+)(%s)\b' % (_keywords,), bygroups(Name.Keyword, Whitespace, Keyword)), - (_keywords + r'\b', Keyword), + (r'^(%s)\b(.*)' % (_keywords,), bygroups(Keyword, String)), (r'#.*', Comment), - (r'.+', using(BashLexer)), + (r'RUN', Keyword), # Rest of line falls through + (r'(.*\\\n)*.+', using(BashLexer)), ], } diff --git a/tests/examplefiles/docker.docker b/tests/examplefiles/docker.docker new file mode 100644 index 00000000..d65385b6 --- /dev/null +++ b/tests/examplefiles/docker.docker @@ -0,0 +1,5 @@ +maintainer First O'Last + +run echo \ + 123 $bar +# comment |