Sebastiaan van Stijn
afbe2869f0
Merge pull request #22187 from thaJeztah/add-madhu-to-maintainers
...
Add Madhu Venugopal to maintainers
2016-04-20 17:17:41 +02:00
moxiegirl
f96d15d3c3
Merge pull request #21389 from chenchun/resize_direct_lvm
...
Resize direct lvm
2016-04-20 06:33:37 -07:00
moxiegirl
fc25376762
Merge pull request #22189 from thaJeztah/restructure-plugin-docs
...
docs: use tables for available plugins
2016-04-20 06:32:23 -07:00
Madhu Venugopal
de806a672b
Initialize activateWait for plugins activated by json spec
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2016-04-20 05:59:19 -07:00
HuKeping
be03c1a9dc
Add some test
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
2016-04-20 20:48:02 +08:00
HuKeping
b3686803c1
Pass to components exactly what they want instead of using global variable
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
2016-04-20 20:46:23 +08:00
HuKeping
3f1806d70b
Move helper function bootstrap to its own file
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
2016-04-20 20:28:59 +08:00
HuKeping
ae889ad37a
Move the configuration for TLS to its own file.
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
2016-04-20 20:25:17 +08:00
HuKeping
8725f6a4c7
Move the configuration for API servers to its own file.
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
2016-04-20 20:18:02 +08:00
HuKeping
3501c0edf5
Move the setUpCryptoservices to its own file.
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
2016-04-20 20:06:51 +08:00
Sebastiaan van Stijn
79351caec1
docs: use tables for available plugins
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2016-04-20 13:45:31 +02:00
HuKeping
a80c539ce8
Move the passphraseRetriever to its own file.
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
2016-04-20 19:42:38 +08:00
HuKeping
dc147d12c4
Add a source file to hold the configuration things for signer
...
Let's name it config.go
Signed-off-by: Hu Keping <hukeping@huawei.com >
2016-04-20 19:42:38 +08:00
HuKeping
ba324344ed
Add a struct for signer config
...
We can use a struct of config to hold all the necessary info that needed
to run a notary signer.
Signed-off-by: Hu Keping <hukeping@huawei.com >
2016-04-20 19:42:38 +08:00
Patrice FERLET
ba10f1cd55
Fix the tests from jenkins
...
Acceptance tests didn't set "help" command to return "0" EXIT_CODE.
close #3354
related #3263
Signed-off-by: Patrice Ferlet <metal3d@gmail.com >
2016-04-20 13:23:37 +02:00
Sebastiaan van Stijn
3cf4cad082
Merge pull request #22179 from wenchma/fix_asa
...
Fix asa
2016-04-20 12:44:29 +02:00
Bilal Amarni
90cb223610
[Generic] clarified doc / messages about ssh-agent
...
As the IdentitiesOnly option is set with the SSH external client,
existing identities in ssh-agent won't be used unless it's the default
location.
Signed-off-by: Bilal Amarni <bilal.amarni@gmail.com >
2016-04-20 11:34:09 +02:00
Sebastiaan van Stijn
06753c6df6
Add Madhu Venugopal to maintainers
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2016-04-20 11:17:32 +02:00
Lucien Gougerot
b0ef41f624
Closes #3285
...
This modification permits the swarm-agent created by docker-machine to
take into account the —swarm-opt arguments.
Signed-off-by: Lucien Gougerot <lucien.gougerot@gmail.com >
2016-04-20 11:16:39 +02:00
Vincent Demeester
34cc274a80
Merge pull request #21380 from sainath14/improve_help_text_test_time
...
Improve the time taken by DockerSuite.TestHelpTextVerify
2016-04-20 08:03:45 +02:00
Wen Cheng Ma
6d4e7b67be
Fix asa
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
2016-04-20 11:14:47 +08:00
Chun Chen
b21d90c28f
Add docs about how to extend devicemapper thin pool
...
Signed-off-by: Chun Chen <ramichen@tencent.com >
2016-04-20 10:49:51 +08:00
Riyaz Faizullabhoy
4d85f964bc
Merge pull request #682 from endophage/store_storage
...
minor cleanup of filestore initialization
2016-04-19 16:49:22 -07:00
Sainath Grandhi
7f33ec7507
Improve the time taken by DockerSuite.TestHelpTextVerify. This test runs docker <command> --help on all commands supported and also check the output
...
when it is passed with bad arguments and no arguments. This patch would divide the total number of commands into five sets and runs them in parallel.
Test time is improved from around 9 seconds to around 3 seconds
Signed-off-by: Sainath Grandhi <sainath.grandhi@intel.com >
2016-04-19 16:46:59 -07:00
Brian Goff
bb91bd3a89
Merge pull request #22043 from WeiZhang555/remove-start-event-failed-start
...
Remove start/die event when fail to start container
2016-04-19 19:45:40 -04:00
David Lawrence
59ae7af769
remove unused tuf/testutils/utils.go
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2016-04-19 15:48:13 -07:00
David Lawrence
4f58eda1ec
removing unused functions in SimpleFileStore
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2016-04-19 15:46:56 -07:00
David Lawrence
64ea94567b
refactoring some duplicate code in parsing x509 certs to keys
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2016-04-19 15:46:56 -07:00
David Lawrence
31f02ec0f7
minor cleanup of filestore initialization
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2016-04-19 15:46:56 -07:00
David Lawrence
358add6075
Merge pull request #686 from docker/go1.6.1
...
Update go in dockerfiles to go 1.6.1
2016-04-19 15:45:45 -07:00
Ying Li
ebb2eb8bc6
Merge pull request #683 from cyli/root-rotation-tests
...
Some root rotation tests and CLI warnings
2016-04-19 15:44:03 -07:00
Ying Li
1367311d41
Update client warning to be more clear about why you need to keep your root key past initial root rotation.
...
Signed-off-by: Ying Li <ying.li@docker.com >
2016-04-19 15:14:14 -07:00
Ying Li
cc5211cdf6
Fix server validation and client update tests to also test threshold when testing
...
root rotation with the previous root role.
Signed-off-by: Ying Li <ying.li@docker.com >
2016-04-19 15:14:14 -07:00
Ying Li
839a1d076f
Add support for thresholds, which means signed.VerifyRoot needs to be have just like
...
signed.VerifySignatures. So remove signed.VerifyRoot and just use signed.VerifySignatures
instead. Also, to fix some tests, add an additional check for version when validating
metadata since versions can't be negative.
Signed-off-by: Ying Li <ying.li@docker.com >
2016-04-19 15:14:14 -07:00
Ying Li
0f5a40e591
Use askConfirm rather than processing 'yes' or 'no' input manually everywhere.
...
Signed-off-by: Ying Li <ying.li@docker.com >
2016-04-19 15:14:14 -07:00
Ying Li
2c26ccb118
Warn users before they rotate the root key with the CLI
...
Signed-off-by: Ying Li <ying.li@docker.com >
2016-04-19 15:14:14 -07:00
Ying Li
65851590f6
Add a client update test for root rotations that test that the previous root ROLE is satisfied,
...
as opposed to just requiring we also sign with whatever key the previous root was signed with.
Signed-off-by: Ying Li <ying.li@docker.com >
2016-04-19 15:14:14 -07:00
Ying Li
b941c10523
Update server validation test to assert that old root roles do not affect
...
the server validation requirements at all, just the previous root role
(as opposed to a single old key being required)
Signed-off-by: Ying Li <ying.li@docker.com >
2016-04-19 15:14:14 -07:00
Ying Li
3aeae90290
storage/memory's UpdateMany should fail if versions are not higher
...
Signed-off-by: Ying Li <ying.li@docker.com >
2016-04-19 15:14:14 -07:00
Ying Li
84b1210bf7
Update go in dockerfiles to go 1.6.1 because we want the HTTPS security update
...
Signed-off-by: Ying Li <ying.li@docker.com >
2016-04-19 15:13:39 -07:00
David Lawrence
b188f1ba7f
Merge pull request #684 from docker/add-by-hash
...
Add by hash command
2016-04-19 14:59:01 -07:00
Amit Krishnan
1c967911b9
Update godbus/dbus to v4.0.0
...
Signed-off-by: Amit Krishnan <krish.amit@gmail.com >
2016-04-19 14:51:55 -07:00
Brian Goff
59b83d8aae
Containerize TestDaemonNoSpaceLeftOnDeviceError
...
Why? Because the `mount` here will sometimes fail when run in
`debian:jessie`, which is what the environrment hosting the test suite
is running if run from the `Makefile`.
Also, why the heck not containerize it, all the things.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2016-04-19 17:16:18 -04:00
Riyaz Faizullabhoy
8d357d44cd
Error unit tests for bad cli input, include trustpinning merge
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-04-19 13:59:58 -07:00
David Lawrence
4c52b3801f
Merge pull request #685 from docker/docs-update
...
Update doc diagrams
2016-04-19 13:49:03 -07:00
Riyaz Faizullabhoy
378116d37c
Add empty hashes check for AddTarget
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-04-19 13:39:26 -07:00
Riyaz Faizullabhoy
26c1ce1865
Include addhash command in config and insufficient arg tests
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-04-19 13:39:26 -07:00
Riyaz Faizullabhoy
1abf013e69
Add positive integration test
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-04-19 13:39:26 -07:00
Riyaz Faizullabhoy
2f7d8f9774
addhash command with multihash functionality
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-04-19 13:39:26 -07:00
Riyaz Faizullabhoy
a840012e88
Merge pull request #624 from docker/trust-pinning
...
Trust pinning configuration
2016-04-19 13:38:51 -07:00