buildkit

Author	SHA1	Message	Date
Yong Tang	e69d12f9cc	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> rewritten from github.com/moby/moby 5844736c14b29860ea03b040e9a052e59ad75bfc	2018-06-01 20:10:12 -07:00
Jessica Frazelle	f890a7d8de	fix variables that werent being called Signed-off-by: Jessica Frazelle <acidburn@docker.com> rewritten from github.com/moby/moby 0e025b4bb16c0d4cc6b3f0c040713d061b9b051a	2018-06-01 20:10:12 -07:00
perhapszzy@sina.com	e6f5e7db20	Add line information in the parsed Dockerfile Signed-off-by: perhapszzy@sina.com <perhapszzy@sina.com> rewritten from github.com/moby/moby 5b6c4dd3df4d501018268d5c32bf78380923c292	2018-06-01 20:10:12 -07:00
Tibor Vass	b4f7a7670d	Move builder files to builder/dockerfile Signed-off-by: Tibor Vass <tibor@docker.com> rewritten from github.com/moby/moby f41230b93a77ca7f4d84718f39a4847b6117f694	2018-06-01 20:10:12 -07:00