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
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
84853bd3f3
Fix some typos in comments and strings
...
Most of them were found and fixed by codespell.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
rewritten from github.com/moby/moby 2eee613326fb59fd168849618d14a9054a40f9f5
2018-06-01 20:10:12 -07:00
ec19aea8e6
Fix typos found across repository
...
Signed-off-by: Justas Brazauskas <brazauskasjustas@gmail.com>
rewritten from github.com/moby/moby 927b334ebfc786276a039e45ec097e71bf9a104c
2018-06-01 20:10:12 -07:00
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
f89b05f3f8
Remove LXC support.
...
The LXC driver was deprecated in Docker 1.8.
Following the deprecation rules, we can remove a deprecated feature
after two major releases. LXC won't be supported anymore starting on Docker 1.10.
Signed-off-by: David Calavera <david.calavera@gmail.com>
rewritten from github.com/moby/moby 3b5fac462d21ca164b3778647420016315289034
2018-06-01 20:10:12 -07:00
4b2990c545
Windows: Fix dockerfile\parser unit test
...
Signed-off-by: John Howard <jhoward@microsoft.com>
rewritten from github.com/moby/moby 864e892e2a310c5b67dfd842e39634dd0d99da73
2018-06-01 20:10:12 -07:00
a32ceafce2
Fix dumper program to use proper import
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
rewritten from github.com/moby/moby 1477a3d7fda5e8b29d68ffd5c4d6edead9ba2c61
2018-06-01 20:10:12 -07:00
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
33d54ee8e1
Merge pull request #423 from tonistiigi/update-moby
...
vendor: update moby
2018-06-01 13:53:37 -07:00
9dc5ea28e7
vendor: update moby
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-06-01 11:57:58 -07:00
bb647a68b9
Merge pull request #421 from AkihiroSuda/rootlessdocs
...
fix rootless docs
2018-05-31 21:29:49 -07:00
c9c0603847
fix rootless docs
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-06-01 13:04:55 +09:00
65b526438b
Merge pull request #419 from AkihiroSuda/rootless
...
oci-worker: experimental support for rootless mode
2018-05-31 19:42:11 -07:00
90b0faae17
Merge pull request #418 from tonistiigi/dockerfile-url
...
dockerfile: support building from a Dockerfile URL
2018-06-01 11:28:01 +09:00
adef0dedef
oci-worker: experimental support for rootless mode
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-05-31 16:05:13 +09:00
6b25a56906
dockerfile: support building from a Dockerfile URL
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-05-30 13:20:27 -07:00
a3f37e2780
Merge pull request #416 from tonistiigi/git-transports
...
git: support all git transports
2018-05-30 16:58:39 +09:00
cca48c09bb
Merge pull request #417 from tonistiigi/update-containerd
...
vendor: update containerd to 7f800e0a
2018-05-30 07:50:22 +09:00
1067c24df2
git: support all git transports
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-05-29 10:56:08 -07:00
ff501ac064
vendor: update containerd to 7f800e0a
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-05-29 10:30:33 -07:00
8b131af00d
Merge pull request #415 from tonistiigi/window-size
...
progressui: handle zero window size
2018-05-26 06:59:52 +09:00
e2fc1a702d
Merge pull request #414 from tonistiigi/stdio-debug
...
exec: make stdio debugging optional
2018-05-26 06:59:04 +09:00
5727898274
progressui: handle zero window size
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-05-25 14:38:06 -07:00
1055746728
Merge pull request #413 from tonistiigi/remove-debug
...
exec: remove debug
2018-05-26 06:32:25 +09:00
6b23ab01ce
exec: make stdio debugging optional
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-05-25 11:15:32 -07:00
97ddeffdb2
exec: remove debug
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-05-25 10:45:10 -07:00
09fdcb24dc
Merge pull request #411 from tonistiigi/seccomp-detect
...
executor: runtime check if seccomp is supported
2018-05-25 09:30:31 +09:00
3b874e95f1
executor: runtime check if seccomp is supported
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-05-24 16:34:35 -07:00
7df95aada6
Merge pull request #404 from tiborvass/fix-copy-bugs
...
dockerfile: use updated tonistiigi/copy:v0.1.1 image
2018-05-24 14:26:37 -07:00
9adfee1475
dockerfile: use updated tonistiigi/copy:v0.1.1 image
...
https://github.com/tonistiigi/copy/pull/3
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-05-24 20:57:45 +00:00
6a103ab0ac
Merge pull request #403 from tonistiigi/modtime
...
Fixes for cache invalidation on modtime change
2018-05-24 13:51:50 -07:00
8d3a30583f
Merge pull request #406 from ijc/foreign-platform-handling
...
handling of foreign platform clients
2018-05-24 13:51:39 -07:00
ef1a79a1c1
Allow caller to specify platform for use with imagemetaresolver.
...
This needs to be plumbed through to `imageutil.Config` which is also used from
the `containerimage` package. Since that is used in the context of a Worker the
`platforms.Default()` (corresponding to the platform of the worker itself) is
appropriate so apply a default at that level.
Signed-off-by: Ian Campbell <ijc@docker.com>
2018-05-24 11:23:35 +01:00
c7c9c6cde1
Merge pull request #408 from tonistiigi/cmd-shell-fix
...
dockerfile: fix entrypoint override rules
2018-05-24 14:33:35 +09:00
5fbaff4f66
dockerfile: add test for cmd override and shell
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-05-23 13:27:35 -07:00
1fad598adf
dockerfile: add withShell
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-05-23 12:19:10 -07:00
50386f3772
dockerfile: reset cmd from parent on entrypoint
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-05-23 12:18:14 -07:00
03d9b00d9c
http: include modtime in cache hash
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-05-22 22:24:30 -07:00
a830e4a967
Merge pull request #405 from tonistiigi/pull-scratch
...
Allow empty results in llbsolver
2018-05-23 11:46:48 +09:00
eefc49ff72
dockerfile: detect empty images early
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-05-22 16:54:04 -07:00
8084e8cde9
llbsolver: allow empty returns for opts
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-05-22 15:46:32 -07:00
53738b8211
dockerfile: allow ignorecache on copy
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-05-22 10:50:36 -07:00
06d81be140
Merge pull request #401 from tonistiigi/relative-wd
...
llb: fix relative working directory in client
2018-05-22 16:04:24 +09:00
779d8fa5b2
Merge pull request #400 from tonistiigi/proxy-args
...
Add proxy args support
2018-05-22 16:04:12 +09:00
7e232f5181
llb: fix relative working directory in client
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-05-21 20:46:37 -07:00
d3eacf02f8
Merge pull request #398 from AkihiroSuda/embed-version
...
hack: embed git revison into binaries
2018-05-21 20:35:26 -07:00
c2fa5972e2
Merge pull request #402 from tonistiigi/global-arg-test
...
dockerfile: add global arg test
2018-05-22 10:43:40 +09:00
a9dea8b235
dockerfile: add global arg test
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-05-21 17:10:21 -07:00
286cf44db3
dockerfile: add default build-arg support
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-05-21 16:08:12 -07:00
Yong Tang
Jessica Frazelle
Stefan Weil
Justas Brazauskas
perhapszzy@sina.com
David Calavera
John Howard
Alexander Morozov
Tibor Vass
Tõnis Tiigi
Akihiro Suda
Akihiro Suda
Ian Campbell