1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
moby--moby/builder
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
..
dockerfile Labels set on the command line always override labels in Dockerfile 2016-04-23 18:49:17 -07:00
dockerignore Fix ReadAll to run on Windows. 2016-02-04 14:01:17 -08:00
builder.go Remove reference package dependency from the api. 2016-04-07 15:01:23 -07:00
context.go Windows: Fix failing unit tests 2016-04-06 13:42:15 -07:00
context_test.go Windows: Fix failing unit tests 2016-04-06 13:42:15 -07: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
dockerignore_test.go Dockerignore tests 2016-03-28 22:31:35 +02: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 build cache false positives when build context tar contains unnormalized paths 2016-04-14 17:57:45 -07:00
tarsum_test.go Builder/tarsum unit tests 2016-03-30 06:40:40 +02:00