docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,938 Commits 21 Branches 28 Tags 816 MiB
Commit Graph

3 Commits

Author SHA1 Message Date
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
Stefan Weil 2eee613326 Fix some typos in comments and strings 
Most of them were found and fixed by codespell.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2016-02-22 20:27:15 +01:00
Tibor Vass f41230b93a Move builder files to builder/dockerfile 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-10-05 18:26:47 -04:00