1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
moby--moby/builder/dockerfile
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
..
command Move builder files to builder/dockerfile 2015-10-05 18:26:47 -04:00
parser Labels set on the command line always override labels in Dockerfile 2016-04-23 18:49:17 -07:00
bflag.go Fix typos found across repository 2015-12-13 18:04:12 +02:00
bflag_test.go Move builder files to builder/dockerfile 2015-10-05 18:26:47 -04:00
builder.go Labels set on the command line always override labels in Dockerfile 2016-04-23 18:49:17 -07:00
dispatchers.go Pass upstream client's user agent through to registry on operations beyond pulls 2016-03-21 14:31:47 -07:00
envVarTest Allow for env vars to have spaces in some cases 2015-11-09 12:42:56 -08:00
evaluator.go Enabling expose support for Windows TP5 2016-03-30 17:25:41 -07:00
evaluator_unix.go Enabling expose support for Windows TP5 2016-03-30 17:25:41 -07:00
evaluator_windows.go Windows: Remove TP4 support from main code 2016-04-06 12:12:20 -07:00
internals.go Labels set on the command line always override labels in Dockerfile 2016-04-23 18:49:17 -07:00
shell_parser.go Allow for env vars to have spaces in some cases 2015-11-09 12:42:56 -08:00
shell_parser_test.go Allow for env vars to have spaces in some cases 2015-11-09 12:42:56 -08:00
support.go Unit tests for builder/dockerfile/support 2016-04-16 00:19:58 +02:00
support_test.go Unit tests for builder/dockerfile/support 2016-04-16 00:19:58 +02:00
wordsTest Allow for env vars to have spaces in some cases 2015-11-09 12:42:56 -08:00