Yong Tang 5844736c14 Labels set on the command line always override labels in Dockerfile ... This fix tries to address the inconsistency in #22036 where labels set on the command line will not override labels specified in Dockerfile, but will override labels inherited from `FROM` images. The fix add a LABEL with command line options at the end of the processed Dockerfile so that command line options labels always override the LABEL in Dockerfiles (or through `FROM`). An integration test has been added for test cases specified in #22036. This fix fixes #22036. NOTE: Some changes are from #22266 (@tiborvass). Signed-off-by: Yong Tang <yong.tang.github@outlook.com>		2016-04-23 18:49:17 -07:00
..
dumper	Fix dumper program to use proper import	2015-10-26 13:10:01 -07:00
testfile-line	Add line information in the parsed Dockerfile	2015-11-13 15:41:12 -05:00
testfiles	Remove LXC support.	2015-11-05 17:09:57 -05:00
testfiles-negative
json_test.go
line_parsers.go	Labels set on the command line always override labels in Dockerfile	2016-04-23 18:49:17 -07:00
parser.go	Labels set on the command line always override labels in Dockerfile	2016-04-23 18:49:17 -07:00
parser_test.go	Fix typos found across repository	2015-12-13 18:04:12 +02:00
utils.go	Fix some typos in comments and strings	2016-02-22 20:27:15 +01:00