eb67a37877
Calculate hash based image IDs on pull
...
Generate a hash chain involving the image configuration, layer digests,
and parent image hashes. Use the digests to compute IDs for each image
in a manifest, instead of using the remotely specified IDs.
To avoid breaking users' caches, check for images already in the graph
under old IDs, and avoid repulling an image if the version on disk under
the legacy ID ends up with the same digest that was computed from the
manifest for that image.
When a calculated ID already exists in the graph but can't be verified,
continue trying SHA256(digest) until a suitable ID is found.
"save" and "load" are not changed to use a similar scheme. "load" will
preserve the IDs present in the tar file.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 504e67b867865a2835e8002c01087a2cfd7bfd0e
Component: engine
2015-10-12 10:51:28 -07:00
16cc034238
Merge pull request #16947 from Microsoft/jjh/daemon-broken-on-master
...
Windows: Daemon broken on master
Upstream-commit: 67034e50037829045d90e2db690d21fdec5946e4
Component: engine
2015-10-12 13:40:02 -04:00
5b46df94e1
Merge pull request #15503 from ibuildthecloud/revert-label
...
Revert "Container don't inherit from image labels"
Upstream-commit: b0cbc0228380517ebc5248905f92f6898ea38289
Component: engine
2015-10-12 10:03:18 -07:00
ae24831060
Merge pull request #16945 from estesp/ocd-on-nonmatching-func-names
...
Correct mismatched function names (UID() and Gid())
Upstream-commit: 2d1414e8b0110b2f1857adcafbb65484d5c003fd
Component: engine
2015-10-12 09:15:51 -07:00
1e21bd34c5
Windows: Daemon broken on master
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: bfe252b78184d22d74a555a82aafc9e6dae3babc
Component: engine
2015-10-12 09:11:19 -07:00
b806f82f84
Merge pull request #16900 from ZJU-SEL/16756-update-pull-local
...
update pull-local#16756
Upstream-commit: d7177c1224bee7c427aaf0b6d812c84fe5967af2
Component: engine
2015-10-12 17:49:10 +02:00
ce2e2998fb
Document CFS CPU period / quota support in the API.
...
Docker 1.7 got support for specifying the CFS scheduler's CPU quota and
period. The work appears to have started around commit
dcc50e1d593fd7995189872791c6d7a013f16970. This change updates the API
documentation to reflect the existing support.
Signed-off-by: Victor Costan <costan@gmail.com >
Upstream-commit: 26bd356078a02313649c7562369a2b2de6b63e19
Component: engine
2015-10-12 11:26:39 -04:00
7c902d7e22
Merge pull request #16928 from coolljt0725/fix_16927
...
Fix docker daemon exit immediately after starting without -H option closes #16927
Upstream-commit: 08c5f52d70e539ff168d570b60b0c5d6c1a847c2
Component: engine
2015-10-12 17:24:42 +02:00
bed0f28df0
Document updates for cluster-store-opt
...
This updates the docs for the daemon based on the new cluster-store-opt
for TLS support.
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com >
Upstream-commit: ab83cf37c9df38e058938ef762aaefbc85f98f7d
Component: engine
2015-10-12 08:05:02 -07:00
5e0687e2a2
Correct mismatched function names (UID() and Gid())
...
All the go-lint work forced any existing "Uid" -> "UID", but seems to
not have the same rules for Gid, so stat package has calls UID() and
Gid().
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 79240b9eafa08001912d5b360a654b1ad9cd1d20
Component: engine
2015-10-12 10:58:33 -04:00
88979b7a5e
Add CMD and EXPOSE instruction example
...
Signed-off-by: Mihuleacc Sergiu <mihuleac.sergiu@gmail.com >
Upstream-commit: fad2cc6a18f28658b99be8f2951290b03ccbabf0
Component: engine
2015-10-12 17:30:47 +03:00
dd8ed328c6
Merge pull request #16933 from ZJU-SEL/update-save-load-test-16756
...
update test using c.Assert replace c.Fatal
Upstream-commit: a9e5cb0efb1216e1d9fd5cb061c45475fe92bbcf
Component: engine
2015-10-12 09:54:13 -04:00
bdc1bdd264
update test using c.Assert replace c.Fatal
...
Signed-off-by: Hao Zhang <21521210@zju.edu.cn >
Upstream-commit: d5830d66e0fab58ef5543dd5b0e157b84017c3a4
Component: engine
2015-10-12 06:32:21 -04:00
2ede0b7338
Add zsh completion for 'docker network'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 24174e8a84082ca8ac337858db311a6f39699f3e
Component: engine
2015-10-12 12:06:12 +02:00
eaf757b644
Fix docker daemon exit immediately after starting without -H option closes #16927
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: e38767e197a1456458cda53b4558f56f5b6f22fa
Component: engine
2015-10-12 04:49:25 -04:00
adcbd88f40
update docker_cli_version_test.go
...
fix spelling mistake again
Signed-off-by: Mageee <fangpuyi@foxmail.com >
Upstream-commit: d4d0718ebfc63e5d224ff9d667fe06088eb19563
Component: engine
2015-10-12 15:13:31 +08:00
898a6db0e5
Missing a single dash in error message
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 4e899d64e020a67ca05f913d354aa8d99a341a7b
Component: engine
2015-10-11 22:46:14 -07:00
bffe47ab25
Merge pull request #16929 from HuKeping/add-back
...
Comment: add some lines back
Upstream-commit: 9273c53d83f7413c160608a759d16e33e7061ab8
Component: engine
2015-10-11 22:12:21 -07:00
89e0fe4844
Comment: add some lines back
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: a066b94ef0b4e7d90a6418429b056883e407b665
Component: engine
2015-10-12 19:34:58 +08:00
bb94a5ee85
Remove used param on ParseHost
...
The first param on opts.ParseHost() wasn't being used for anything.
Once we get rid of that param we can then also clean-up some code
that calls ParseHost() because the param that was passed in wasn't
being used for anything else.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: ba973f2d74c150154390aed1a5aed8fb5d0673b8
Component: engine
2015-10-11 20:45:17 -07:00
6841b07f52
volume create error on conflict option
...
Signed-off-by: Kun Zhang <zkazure@gmail.com >
Upstream-commit: 0ff3123eba071166def8072d8c7f3aa9afa0b56f
Component: engine
2015-10-12 11:16:39 +08:00
b34ed2cbab
Merge pull request #15753 from SvenDowideit/make-windows-default-to-use-2376
...
Default the tcp port to 2376 if tls is on, and 2375 if not
Upstream-commit: c45ad0b02d1cc1f88aaabab18aed27aeb20b9e7a
Component: engine
2015-10-11 15:35:04 -07:00
7dfb385d48
Merge pull request #16764 from thaJeztah/follow-the-white-rabbit
...
Docs: add Docker version/API version matrix
Upstream-commit: 70edf41c06719912e1d787f9f9e77705c81a0228
Component: engine
2015-10-11 15:28:46 -07:00
deb9d3a7fc
Merge pull request #16865 from MHBauer/registry-service-refactor
...
refactor away direct references to daemon member
Upstream-commit: 6e12d9fe62f201dac221be5064e743f59f9a1953
Component: engine
2015-10-11 21:47:58 +02:00
ea84c86ac9
Merge pull request #16618 from abronan/fix_discovery_pkg_readme
...
Fix discovery package README with the right --cluster* flags
Upstream-commit: 3a24eb2de468c34195dc9fc6b036492a0095bbf1
Component: engine
2015-10-11 12:05:07 -07:00
1018cbd343
Bash completion for docker network
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 68de2d48341fa7c2acd441429bb30fc50f875e24
Component: engine
2015-10-11 11:07:48 -07:00
51395cbbce
Refactor bash completion: pull out subcommand parsing
...
`docker network` is the second command with subcommands.
This refactoring pulls out parsing and processing of subcommands
from `docker volume` completion and thus makes its logic available
for other commands.
Also enables `__docker_pos_first_nonflag` for subcommand completion.
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: e4bf5cff49a152794b924d9cf4d6cee605f2d73a
Component: engine
2015-10-11 11:07:33 -07:00
6b6c7cc2b6
Enabled GitHub Flavored Markdown
...
GitHub flavored markdown is now supported for links and images. Also, ran LinkChecker and FileResolver. Yay!
Fixes from Spider check
Output for docker/docker now goes into engine directory
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 8fee1c2020186ac100b45e64864b94ae3a169ad5
Component: engine
2015-10-11 07:49:54 -07:00
a9b61f95aa
Add user namespace check to check-chonfig.sh
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: d475c4ddc1b8a3a15a10c20c4ec4e15f642d71e4
Component: engine
2015-10-11 17:26:34 +08:00
975b04d785
use of checkers on Integration test
...
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn >
update integration-cli/docker_cli_wait_test.go
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn >
update integration-cli/docker_cli_wait_test.go
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn >
update docker_cli_wait_test.go
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn >
Upstream-commit: 19c30447b51a474312aacccf48495abcce7c21fa
Component: engine
2015-10-11 11:31:01 +08:00
5c41f54d45
Update integration test with Assert
...
Part of #16756
Update integration-cli/docker_cli_rmi_test.go:
Use Assert instead of condition judgement in test.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: c6b02ad73b545cedeb53715b2d7b22a2354722f8
Component: engine
2015-10-11 10:56:02 +08:00
3f57348450
update pull-local#16756
...
Signed-off-by: heartlock <21521209@zju.edu.cn >
Upstream-commit: dc9dd188cf384d2ab868444bed74417a062d3592
Component: engine
2015-10-11 09:57:25 +08:00
36fdf8f132
Merge pull request #12648 from estesp/userns-impl
...
Phase 1 implementation of user namespaces as a remapped container root
Upstream-commit: ed9434c5bb64f49db442027e5e748bfbb46d0a0a
Component: engine
2015-10-10 11:38:07 -07:00
13a51ee1e5
Merge pull request #16907 from sdurrheimer/zsh-completion-cluster-store-opt
...
Add zsh completion for '--cluster-store-opt'
Upstream-commit: ef4b053b9064888eadf25e48f7f1d4d5896da8fb
Component: engine
2015-10-10 10:32:08 -07:00
f7f7d80c89
Merge pull request #16800 from duglin/buildCache
...
Add useful info to builder cache logrus.Debug
Upstream-commit: ec05d93c16d6955e62285e82373da3aac9f44025
Component: engine
2015-10-10 17:38:43 +02:00
fa4c923057
Add docker info show base filesystem size of container/image when use devicemapper
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 5c374c7137c3749bff7f85d3fad94290f63034db
Component: engine
2015-10-10 22:52:05 +08:00
e49a07f95b
Add zsh completion for '--cluster-store-opt'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: ae31aa10abae62f95443ca610b0bae2662973776
Component: engine
2015-10-10 16:42:01 +02:00
d58c684b1c
Use checkers on Integration test when possible
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 72269acf296ca3aac0ee637724baf75766ab4175
Component: engine
2015-10-10 21:51:15 +08:00
f800251e5f
Add useful info to builder cache logrus.Debug
...
Closes : #16790
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 4920d4009330365babd228e6c27e317a672edc87
Component: engine
2015-10-10 05:53:06 -07:00
47d7f02c89
Merge pull request #16838 from ZJU-SEL/update-save-load-unix-test
...
update save-load-unix-test
Upstream-commit: faa448e801ffb09eb83582d3203cc9fb0eb3cbde
Component: engine
2015-10-10 14:51:18 +02:00
9375e8c909
add size to inspect
...
Signed-off-by: Zhang Kun <zkazure@gmail.com >
Upstream-commit: b4d6b23838bb7d8436a1966fc3ef3ade83544d58
Component: engine
2015-10-10 20:44:29 +08:00
be4b863cca
Merge pull request #16895 from vdemeester/ocd-validate-typo
...
Fix few comments in validate scripts
Upstream-commit: a6bbf16aa1f8246f6979eaebf213e549e75b7b90
Component: engine
2015-10-10 12:08:37 +02:00
b322914fe9
Merge pull request #16899 from jfrazelle/provide-dates
...
fix depreciation dates
Upstream-commit: 5f2e0864e41d5fa417116a6f6d157c245f4d11e3
Component: engine
2015-10-10 12:06:34 +02:00
89cc0cc0cb
Merge pull request #16874 from ZJU-SEL/fix-parse-run-volumes
...
fix the error msg of func TestParseRunVolumes
Upstream-commit: 99c247a46a1827a3460e62b718af334f2847f5e6
Component: engine
2015-10-10 11:27:08 +02:00
ec720a54c6
Fix few comments in validate scripts
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 1ce9be346b0d4df3b9b4fdf521b1cbb9cb111fc0
Component: engine
2015-10-10 11:21:04 +02:00
c06269ae99
fix fish completion; wrong image names bug; close #16672
...
Signed-off-by: Viktor Stanchev <me@viktorstanchev.com >
Upstream-commit: 4d746658cced59cdbcc2e045d8ed931f782ef1dd
Component: engine
2015-10-10 00:55:09 -07:00
7e7a22b183
update save-load-unix-test
...
Signed-off-by: xlgao-zju <xlgao@zju.edu.cn >
Upstream-commit: 8d98b370317d196e958f295d74bc37e596e1913a
Component: engine
2015-10-10 15:16:42 +08:00
a670fb3535
fix the error msg of func TestParseRunVolumes
...
Signed-off-by: xlgao-zju <xlgao@zju.edu.cn >
Upstream-commit: 8363f2f171952682ff872417bca727abc54577ac
Component: engine
2015-10-10 14:56:50 +08:00
2000bb0d9e
fix depreciation dates
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 26701e2d9fc9e45f39b091351088b6b9a9f019d5
Component: engine
2015-10-09 20:24:04 -07:00
171ab4083f
Merge pull request #16894 from diogomonica/renaming-trust-keys
...
Renaming trust keys
Upstream-commit: bf80adeee49e78e181007ff6790bf1ff2b22a72e
Component: engine
2015-10-09 23:20:54 -04:00
