c1f75e87da
DOCKER_VERSION and docker-version havn't been implemented.
...
So far, it looks like the declarations are not used, and so its safer not to
confuse people into thinking they do something.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 6ed610fb8014d500e001bb0677f0e1af0dc9312d
Component: engine
2014-10-21 16:04:11 +10:00
d86ec1998c
Merge pull request #8578 from erikh/fix_slash
...
builder: Handle trailing \ appropriately.
Upstream-commit: 9a827137725d13dbe14c577df40dc35d061152b3
Component: engine
2014-10-15 12:11:37 -07:00
ac6df7dc24
builder: comments should also be elided in the middle of statements following a line continuation.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 96f342f7030c3955900f8f2ddf06b0d36b1d993c
Component: engine
2014-10-15 08:44:14 +00:00
8a73cf85f8
builder: strip blank lines before processing any line continuations.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: a1ef2207dd1f63a4104cfbf7927931174f5438a5
Component: engine
2014-10-15 04:00:17 +00:00
61f914763d
builder: Handle trailing \ appropriately.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 7fa449191ce9abc3e0a5261b66d8338948f66940
Component: engine
2014-10-15 03:08:18 +00:00
94f1cd5e88
ignore invalid Dockerfile instructions and do not consider "docker-version" a Dockerfile instruction
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: 0a2c481c7f24fcd295b1e1f6504732971b289919
Component: engine
2014-10-06 23:26:59 -04:00
009f167f3a
Fix builder/parser so it keeps some whitespace on split lines.
...
If previous line ends with whitespace, or next line starts with whitepsace
we need to preserve a space otherwise things line:
RUN echo\
hello
will appear as: RUN echohello
Noticed this while looking at #5744 because he had lines ending in &&\
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: f440c6b2246cc4cfac4c5d351172e209dca2c765
Component: engine
2014-10-03 20:33:12 -07:00
cdd6c2350b
builder: Fix handling of VOLUME command where multiple volumes are
...
specified in a space delimited list.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: a5ca549a18fb5c1006005cc220ab330eec3018de
Component: engine
2014-09-25 09:44:19 -07:00
35b33a60e1
builder/parser: fix handling of empty strings as the only argument.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 6b322ad2d32b1525ad01611f0d6ad8d803f5f6f0
Component: engine
2014-09-11 06:00:24 -07:00
c4ae3304f1
builder/parser/dumper: Handle newlines appropriately.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 234f0e4f79c27a4820f75a504fdcd45b2981a68a
Component: engine
2014-09-11 06:00:24 -07:00
27916f0d04
builder: handle certain classes of JSON errors gracefully
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 21b15ac920d5e51f636d7febf07a4a52f5e61bff
Component: engine
2014-08-27 18:52:30 -07:00
8d44d56320
builder: add command handling to evaluator.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: d6c0bbc3cbf9204c506fedf4d0c5a477c7559a1d
Component: engine
2014-08-27 18:52:30 -07:00
68301c3828
builder: parser and beginnings of the evaluator
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 22c46af4b358cf3ec4f7af47c701064c00cf7de4
Component: engine
2014-08-27 18:52:29 -07:00
