736fc7338e
refactor integration test to use checkers
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: a1d4b7dd0d1ca076bf70b7d23d5ad86518681b95
Component: engine
2015-10-13 20:21:38 +08:00
9b2f66b864
Merge pull request #16958 from tonistiigi/digest-collision
...
Make sure tags and digests don’t collide
Upstream-commit: 9a13c2dc79cc868ba3a863137ba27297314167e4
Component: engine
2015-10-12 15:45:34 -07:00
00df3b3fae
Merge pull request #16962 from estesp/check-network-files-exist
...
Make sure network files exist before adding them to mounts
Upstream-commit: 09ddb67dd416778b63f122cfbbf4fa335b7b504a
Component: engine
2015-10-12 15:38:51 -07:00
939faf2998
Merge pull request #16009 from azurezk/vol-create-conflict-option
...
volume create error on conflict option
Upstream-commit: df79536769eab04a7f1c618f9a390b36be6c53be
Component: engine
2015-10-12 15:27:36 -07:00
8c9497957a
Merge pull request #16942 from physicalit/master
...
Add CMD and EXPOSE instruction example
Upstream-commit: dc500630ec0e6c69822bf6cd62a40ed6d029e2d3
Component: engine
2015-10-12 15:26:30 -07:00
0588337d9b
Merge pull request #16888 from dhiltgen/discovery_tls
...
Document updates for cluster-store-opt
Upstream-commit: c59e24ff12abf284ed179dcbc68fb8e7696ce6a7
Component: engine
2015-10-12 15:26:08 -07:00
bcec6f94b2
Make sure tags and digests don’t collide
...
Tags and digests are kept in the same storage. We want to make sure that they are completely separated - tags are something users set and digests can only be set by pull-by-digest code path.
Reverts #14664
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: d08ca5c2b65d442f37424957e53d81f96356d12c
Component: engine
2015-10-12 14:20:11 -07:00
21d501b5ba
Make sure network files exist before adding them to mounts
...
It is possible that network files do not exist, especially in the case
of `--net=host` where a host OS (like CoreOS) does not use certain
standard network files. This patch verifies that the source file of a
network mount point exists before adding it to the list of mount points
for bind mounting from the container's metadata directory.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: ed68486f687ce9d5963d7250f70dc66c9f14cd63
Component: engine
2015-10-12 17:18:34 -04:00
83fda87144
Merge pull request #16954 from jfrazelle/update-changelog-master
...
Update changelog master
Upstream-commit: 96965e2abdca3e0f0b02c8a44f842ccdea1bfb24
Component: engine
2015-10-12 12:31:15 -07:00
d1b3c438f4
Merge pull request #16953 from aaronlehmann/master-security
...
Add 1.8.3 security fixes to master
Upstream-commit: eebf88ffd336819ecfdd7bc1206ee7bc8fbfe7ed
Component: engine
2015-10-12 12:20:49 -07:00
ae4ea17577
Merge pull request #16904 from vikstrous/fish_completion_bug
...
fix fish completion wrong image names bug
Upstream-commit: 151564d39b5df4d428a4709e20b0e9eaac89f6ad
Component: engine
2015-10-12 20:42:24 +02:00
2151d5fbfe
Merge pull request #16914 from coolljt0725/add_userns_check
...
Add user namespace check to check-chonfig.sh
Upstream-commit: 0b122dc55bfebaa167f63fd8d010d0c7b1e87c99
Component: engine
2015-10-12 20:39:46 +02:00
41aa2df8d1
Merge pull request #16934 from sdurrheimer/zsh-completion-docker-network
...
Add zsh completion for 'docker network'
Upstream-commit: 6bacb327559007a78ce89b476d6caa19c7915c74
Component: engine
2015-10-12 11:29:57 -07:00
2041f7a5b7
bump version back to 1.9.0-dev
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 01ca4f621d4eab91799712622f0c1146cb361f2d
Component: engine
2015-10-12 11:18:28 -07:00
5cbe253b4d
bump version for v1.8.3
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
(cherry picked from commit f4bf5c7026816785d9f63c07e87f9450a49f2403)
Upstream-commit: ec97bc93945ef1f7c4cdf2e820d4770c120d1c90
Component: engine
2015-10-12 11:18:04 -07:00
8898de5ddc
Merge pull request #16951 from icecrime/maintainers_rm_fred
...
Remove fredlf from MAINTAINERS
Upstream-commit: 8a71e005b47024c5dc7450eaae1005c38b671d5c
Component: engine
2015-10-12 11:07:50 -07:00
ffaa97f8a7
Remove fredlf from MAINTAINERS
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: c2d21fa9d31e7d199a24456d38035b5b22bbc1b3
Component: engine
2015-10-12 10:58:04 -07:00
a4f5e10d65
Remove trust package
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: cba4bbad4f0e03d782a22f57d653d3109bca0208
Component: engine
2015-10-12 10:51:28 -07:00
67f6b24e87
Unmarshal signed payload when pulling by digest
...
Add a unit test for validateManifest which ensures extra data can't be
injected by adding data to the JSON object outside the payload area.
This also removes validation of legacy signatures at pull time. This
starts the path of deprecating legacy signatures, whose presence in the
very JSON document they attempt to sign is problematic. These
signatures were only checked for official images, and since they only
caused a weakly-worded message to be printed, removing the verification
should not cause impact.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 011bfd666eeb21a111ca450c42a3893ad03c9324
Component: engine
2015-10-12 10:51:28 -07:00
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
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
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
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
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
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
Shijiang Wei
Tibor Vass
Jess Frazelle
Sebastiaan van Stijn
moxiegirl
Tonis Tiigi
Phil Estes
Arnaud Porterie
Vincent Demeester
Jessica Frazelle
Michael Crosby
Aaron Lehmann
Phil Estes
Alexander Morozov
John Howard
Antonio Murdaca
Daniel Hiltgen
Mihuleacc Sergiu
Hao Zhang
Steve Durrheimer
Lei Jitang
Sven Dowideit
Hu Keping
Doug Davis
Kun Zhang
Xiaoxu Chen
heartlock