Yong Tang 0c8c9bada9 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> (cherry picked from commit 5844736c14)		2016-04-25 15:10:31 -07:00
..
dockerfile	Labels set on the command line always override labels in Dockerfile	2016-04-25 15:10:31 -07:00
dockerignore	Fix ReadAll to run on Windows.	2016-02-04 14:01:17 -08:00
builder.go	Pass upstream client's user agent through to registry on operations beyond pulls	2016-03-21 14:31:47 -07:00
context.go	Move getContext… function to builder package	2016-02-11 20:59:59 +01:00
context_unix.go	Move validateContextDirectory to builder package.	2016-02-09 22:19:09 +01:00
context_windows.go	Move validateContextDirectory to builder package.	2016-02-09 22:19:09 +01:00
dockerignore.go	utils: move dockerignore function to builder/dockerignore	2015-12-14 14:59:52 +01:00
git.go	utils: move git functions to pkg/gitutils	2015-12-14 14:59:52 +01:00
remote.go	Move getContext… function to builder package	2016-02-11 20:59:59 +01:00
remote_test.go	remove unnecessary temporary variable	2015-11-26 10:25:55 +08:00
tarsum.go	Fix symlink handling in builder ADD/COPY commands	2015-11-06 10:58:12 -08:00