p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,998 Commits 2 Branches 295 Tags
eba231efa055c19f32ae13229c9fab38f3825ef2
Commit Graph

39 Commits

Author SHA1 Message Date
Tibor Vass
eba231efa0 Merge pull request #10120 from duglin/TrimSpaces 
Remove leading/trailing spaces in builder/parser
Upstream-commit: 82191cc3f3b3ea49da6287abdb9c2ba6eb6d253c
Component: engine
 2015-02-06 16:25:37 -05:00
Doug Davis
7b03f17d1a Remove leading/trailing spaces in builder/parser 
Per Erikh's suggestion at:
https://github.com/docker/docker/pull/9989#issuecomment-69832009
this PR will trim spaces in the parser to ensure that the user gets the same
results irrespetive of leading/trailing spaces.

Per @tiborvass's suggestion I added a test to make sure spaces in quotes
are not touched.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 3859c485317a395de1e8eb48270d0e3b1207a204
Component: engine
 2015-02-06 08:52:18 -08:00
Chen Hanxiao
5bd881552f fix comments typos 
s/propogated/propagated

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
Upstream-commit: ef3192f161a89bbff11d88da523be61484a822f2
Component: engine
 2015-02-04 10:47:37 +08:00
Tibor Vass
1a5071a250 Merge pull request #9826 from icecrime/8318_whitespace_add_copy 
Support whitespace in paths for ADD and COPY
Upstream-commit: 50ff27caa13b4c558b0ddc9f65297b6ef6eb119d
Component: engine
 2015-01-19 18:37:53 -05:00
Jessie Frazelle
f71acef86e Merge pull request #9881 from tianon/json-array-of-strings 
Adjust builder to validate that JSON in Dockerfiles are arrays of strings and nothing else to match how we describe them to people (and what all our existing tests already assumed)
Upstream-commit: 640e0fc578e5acdaa71216a300396dfa9af8054f
Component: engine
 2015-01-14 17:13:51 -08:00
Erik Hollensbe
0e19110387 Fix a parser error where an empty RUN statement would cause a panic 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 09e3467452d24aca38810fa79a09d6371d2c0b5c
Component: engine
 2015-01-08 11:30:08 -08:00
Tianon Gravi
3bf489de75 Adjust builder to validate that JSON in Dockerfiles are arrays of strings and nothing else to match how we describe them to people (and what all our existing tests already assumed) 
This also adds more tests to help verify this, including unicode and nonprintable characters (hence the earlier commit switching to strconv.Quote).

As a bonus, this fixes a subtle bug where [] was turned into [""] and then turned back into [] (and thus [""] was impossible to actually round-trip correctly in a Dockerfile).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 05c2d2db9a95266217a639e2109be6fc6482a716
Component: engine
 2015-01-05 14:31:05 -07:00
Tianon Gravi
74fe90f089 Simplify builder TestTestData slightly by using ioutil.ReadFile instead of os.Open+ioutil.ReadAll 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: f6cb1ea85a7a75193644b8ba4516cb586c5dc52f
Component: engine
 2015-01-02 22:38:52 -07:00
Tianon Gravi
d0cdce5ce4 Simplify builder ast.Dump by using strconv.Quote instead of a custom QuoteString function (the only change to existing files is literal tabs becoming \t, but future files may use nonprintable characters and the like now) 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 1edf16e977a3dd18f9ff15b4acf40b0c1ac64788
Component: engine
 2015-01-02 22:36:58 -07:00
Seongyeol Lim
7a2e194724 Add support file name with whitespace for ADD and COPY command 
Closes #8318

Signed-off-by: Seongyeol Lim <seongyeol37@gmail.com>
Upstream-commit: abfb7138871993c53050a2d159ca0fae07bf65e8
Component: engine
 2014-12-26 16:28:03 -08:00
Doug Davis
5dafd01fe8 Add support for ENV of the form: ENV name=value ... 
still supports the old form: ENV name value

Also, fixed an issue with the parser where it would ignore lines
at the end of the Dockerfile that ended with \

Closes #2333

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 1314e1586f8cd6201c16161eb960a743c727946b
Component: engine
 2014-11-20 09:54:28 -08:00
Hans Rødtang
69df5cc039 Updated cover tool import path. 
Signed-off-by: Hans Rødtang <hansrodtang@gmail.com>
Upstream-commit: b4336803f35591c8e4d94b023c9d5e9525795520
Component: engine
 2014-11-14 06:16:41 +01:00
xuzhaokui
7a77c7a4b5 Remove the redundant stripComment. 
Signed-off-by: xuzhaokui <cynicholas@gmail.com>
Upstream-commit: 6c79ee7d1e38f7b2f408105db9af7fcf9942f7ca
Component: engine
 2014-11-09 23:07:44 +08:00
Erik Hollensbe
dc1bcb95a0 builder: some small fixups + fix a bug where empty entrypoints would not override inheritance. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: cdd6e97910c50e5766c8bec2121f906e9ee2d119
Component: engine
 2014-10-24 00:23:25 +00:00
Sven Dowideit
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
Michael Crosby
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
Alexandr Morozov
33fccf1f63 Merge pull request #8579 from erikh/builder_html_panic 
builder: handle anything we cannot parse the command for as a fatal error
Upstream-commit: abec82bdeee84cef603561ae29fed45e45130a7c
Component: engine
 2014-10-15 12:01:52 -07:00
Erik Hollensbe
7e0088079e builder: provide a friendly message on parser errors 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 3f2eb353bdbb36ce26690909bcf761d4289294d6
Component: engine
 2014-10-15 18:08:23 +00:00
Erik Hollensbe
4a6aadc8cd builder: handle anything we cannot parse the command for as a fatal error. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 63637b9d277d322a06f24e3195fab48bc2a705d6
Component: engine
 2014-10-15 08:47:15 +00:00
Erik Hollensbe
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
Erik Hollensbe
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
Erik Hollensbe
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
Erik Hollensbe
3381602232 builder: ONBUILD triggers were not accurately being executed in JSON cases. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 1150c1639a9efbd2e5e4ac1e71961aef77a32de0
Component: engine
 2014-10-14 01:59:45 +00:00
Tibor Vass
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
Doug Davis
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
Erik Hollensbe
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
Erik Hollensbe
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
Erik Hollensbe
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
Erik Hollensbe
3c324ec48a Fix panic when ENV ARG=ARG is used. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: a0255ba502d7a60a297aa67604eae75a9e1fbed3
Component: engine
 2014-08-31 05:39:36 -07:00
Erik Hollensbe
4308bf42dd builder: several fixups from comments 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 305f73508022d0a3af65faa327aa798610969875
Component: engine
 2014-08-27 18:52:30 -07:00
Erik Hollensbe
e5b50b40c8 builder: Fix handling of ENV references that reference themselves, plus tests. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: cb51681a6db4b7c62d91998ba3b1d3b98c09c61c
Component: engine
 2014-08-27 18:52:30 -07:00
Erik Hollensbe
5864fecb92 builder: Remove spurious .gitignores 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 3dfe5ddfb98a36ddcf2480720255a3a00f5fbc1d
Component: engine
 2014-08-27 18:52:30 -07:00
Erik Hollensbe
6e79082f26 builder/parser: Rewrite Parse() to use := instead of var 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 248f4c4f751b76f330278b04d2297bfcf97eec48
Component: engine
 2014-08-27 18:52:30 -07:00
Erik Hollensbe
79129740f8 builder: Remove blankNode(), use &Node{} instead. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 135f54ccbfb6f638b4ab0be67a215adbad246ecb
Component: engine
 2014-08-27 18:52:30 -07:00
Erik Hollensbe
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
Erik Hollensbe
b8ca57b41d builder: negative test support, fix for shykes's broken dockerfile 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 4122a981ae12851f71bbf6ec46e03bba288e4143
Component: engine
 2014-08-27 18:52:30 -07:00
Erik Hollensbe
1fe3a4f0e3 builder: comments / documentation 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 3f5f6b038f56bc89d39a74fbb9c765daf98ae4d8
Component: engine
 2014-08-27 18:52:30 -07:00
Erik Hollensbe
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
Erik Hollensbe
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