Tibor Vass
b32c4cb459
Fix issue where Search API endpoint would panic due to empty AuthConfig
...
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-07-16 12:38:44 -04:00
Sebastiaan van Stijn
8c77e39627
Merge pull request #14571 from charleswhchan/patch-2
...
Documentation: Split apt-get example onto multiple lines
2015-07-16 18:32:56 +02:00
David Calavera
ac8299ae15
Merge pull request #14623 from HuKeping/refactor-dockercmd
...
Refactor : Use dockerCmd in integration-cli tests
2015-07-16 09:24:59 -07:00
Hu Keping
71868228c7
Refactor : Use dockerCmd in integration-cli tests
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-07-17 04:07:12 +08:00
Victor Vieux
bfd3fdfa4c
Merge pull request #1063 from peggyl/scheduler-strategy-godoc
...
Add more meaningful godoc comments for the scheduler/strategy package
2015-07-16 09:06:26 -07:00
Alexander Morozov
97515a35ca
Merge pull request #14604 from Microsoft/10662-addbridge
...
Windows: Plumb through -b on daemon
2015-07-16 08:44:40 -07:00
Aanand Prasad
9d0bbdf8dd
Make scale timeout configurable, default to 10
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-07-16 16:39:38 +01:00
Aanand Prasad
ca298309e0
Merge pull request #1713 from mnowster/increase-default-worker-number
...
Increase max-workers
2015-07-16 16:33:01 +01:00
Doug Davis
081991c01e
Add missing 'Names' field to /containers/json API output
...
Closes #14675
Wasn't sure how far back I needed to go so I did just a few.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-07-16 08:23:55 -07:00
Mazz Mosley
29f51f8216
Increase max-workers
...
There's significant speed improvement by having more workers. This
value still shouldn't cause anyone's machines to melt/explode.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com >
2015-07-16 16:17:26 +01:00
James Turnbull
b70428c4dd
Merge pull request #14670 from chenchun/fix_fluentd_link
...
Fix fluentd link name
2015-07-16 10:44:54 -04:00
Charles Chan
c4d2b34d13
Split apt-get example onto multiple lines. Use extra spaces to align the code block.
...
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
2015-07-16 06:42:07 -07:00
Mazz Mosley
da6cbd4535
Improve output for parallel command
...
This approach takes the style of replacing the output message, in
place, when the command has finished executing. Bringing it a bit
more inline with what `docker pull` does.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com >
2015-07-16 11:51:45 +01:00
Aanand Prasad
29ceef6d93
Merge pull request #1706 from aanand/bump-1.3.3
...
Bump 1.3.3
2015-07-16 11:40:20 +01:00
Aanand Prasad
8cff440800
Bump 1.3.3
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-07-16 11:21:01 +01:00
Mazz Mosley
e5f6ae767d
Merge pull request #1704 from aanand/fix-timeout-type
...
Make sure up/restart/stop timeout is an int
(cherry picked from commit c7dccccd1f )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-07-16 11:19:21 +01:00
Mazz Mosley
c7dccccd1f
Merge pull request #1704 from aanand/fix-timeout-type
...
Make sure up/restart/stop timeout is an int
2015-07-16 10:50:06 +01:00
Mazz Mosley
3a775388b2
Merge pull request #1698 from aanand/use-docker-1.7.1
...
Test against Docker 1.6.2 and 1.7.1
2015-07-16 10:48:24 +01:00
Peggy Li
5d1ae7b674
Add more meaningful godoc comments for the scheduler/strategy package
...
Signed-off-by: Peggy Li <peggyli.224@gmail.com >
2015-07-16 02:06:04 -07:00
Robin Schneider
397de38ae6
Updated usage information because of removed short parameters.
...
Signed-off-by: Robin Schneider <ypid@riseup.net >
2015-07-16 10:44:58 +02:00
Chun Chen
ed23ecd305
Fix fluentd link name
...
Signed-off-by: Chun Chen <ramichen@tencent.com >
2015-07-16 14:23:56 +08:00
Diogo Mónica
1a5ad474f3
Merge pull request #66 from docker/rename-certificate-stores
...
Rename certificate stores to trustedCertificateStore and trustedCAStore
2015-07-15 22:40:03 -07:00
Diogo Mónica
0ed6072a4a
Merge pull request #67 from docker/adding-certs
...
Adding new certificates
2015-07-15 22:35:54 -07:00
Richard Scothern
8eafc998f7
Merge pull request #63 from endophage/fix_sql
...
fixing database queries
2015-07-15 22:33:48 -07:00
Shijiang Wei
ce6410cd4c
don't allow deleting the image of running containers
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
2015-07-16 13:14:48 +08:00
Diogo Monica
3debfbca10
Reissued all certs with correct SANs
...
Signed-off-by: Diogo Monica <diogo@docker.com >
2015-07-15 21:42:24 -07:00
Alexandre Beslic
1ab4129df6
Merge pull request #1048 from aluzzardi/leader-prefix
...
Leader Election: Use same path prefix as discovery.
2015-07-15 21:14:00 -07:00
Stephen Day
92aa378df4
Merge pull request #702 from ayosec/patch-1
...
Fix link to token specification
2015-07-15 21:05:15 -07:00
Ayose Cazorla
dbf3ce3cde
Fix link to token specification
...
Link was broken in cf9b4ab5e9
Signed-off-by: Ayose <ayosec@gmail.com >
2015-07-16 04:51:34 +01:00
Sven Dowideit
14443ba2aa
remove the preprocessing
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-07-15 20:49:24 -07:00
Sven Dowideit
a22901cde2
remove the html comments, they're not supported by hugo
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-07-15 20:44:20 -07:00
Diogo Monica
ddfcd50471
Changing .pem to .crt everywhere
...
Signed-off-by: Diogo Monica <diogo@docker.com >
2015-07-15 20:44:09 -07:00
Sven Dowideit
c4bab8b8b8
fix links by using the hugo syntax for cross-referencing
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-07-15 20:36:53 -07:00
Sven Dowideit
9316d94dc3
WIP fixing hugo linking
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-07-15 20:29:24 -07:00
Charles Chan
f373bd97c3
Trim excess from image. Based on the context, the email itself is sufficient.
...
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
2015-07-15 20:15:57 -07:00
Diogo Monica
3d58e6b810
Added tests for x509Filestore
...
Signed-off-by: Diogo Monica <diogo@docker.com >
2015-07-15 19:57:48 -07:00
Diogo Monica
d743dfac6e
Fixed config files and trust manager tests to point at new fixtures
...
Signed-off-by: Diogo Monica <diogo@docker.com >
2015-07-15 19:46:57 -07:00
Diogo Monica
cdee810942
Changed notary-server to point at new certs
...
Signed-off-by: Diogo Monica <diogo@docker.com >
2015-07-15 19:45:34 -07:00
Diogo Monica
9a065a8d40
Adding new testing fixtures
...
Signed-off-by: Diogo Monica <diogo@docker.com >
2015-07-15 19:44:58 -07:00
Diogo Monica
76d81563b3
Simplifying AddCertFromPEM to use help functions
...
Signed-off-by: Diogo Monica <diogo@docker.com >
2015-07-15 19:44:37 -07:00
Jeffrey Morgan
04124d82a9
Change download links
2015-07-15 19:10:30 -07:00
Sven Dowideit
5e1e54d619
Fixing links that have been broken during the conversion to the new docs tooling
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-07-15 18:58:11 -07:00
Aaron Lehmann
36a8f77129
Rename certificate stores to trustedCertificateStore and trustedCAStore
...
Add convenience methods to KeyStoreManager to add certs to both cert
stores.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2015-07-15 18:10:53 -07:00
Diogo Mónica
06e445c2ef
Merge pull request #64 from docker/signer-use-gotuf-types
...
Change notary-signer to use gotuf's key types
2015-07-15 17:44:57 -07:00
Aaron Lehmann
c54f2d0768
Merge pull request #62 from docker/import-export
...
Add key import and export features
2015-07-15 17:43:19 -07:00
Aaron Lehmann
167a07c894
Change notary-signer to use gotuf's key types
...
This causes notary-signer to use gotuf's Key interface instead of
defining its own redundant types.
We can go further with this in the future by removing the redundant
ED25519 implementation. This would be refactored into the cryptoservice
package, and notary-signer would be changed to use that package's
cryptoservice for key creation and signing operations.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2015-07-15 17:22:46 -07:00
Aaron Lehmann
e5a42d4df9
Add ExportKeysByGUN function
...
It exports the keys for a particular GUN to a zip, encrypted with a
specified passphrase.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2015-07-15 17:14:57 -07:00
Aaron Lehmann
6d3d98b873
Move non-root keys to tuf_keys subdirectory
...
This subdirectory is at the same level as root_keys. It avoids having
rootKeyStore and nonRootKeyStore overlap. Previously, the base directory
for rootKeyStore was .../private/root_keys and the base directory for
nonRootKeyStore was .../private.
This commit also removes deduplicating logic in ExportAllKeys, which is
no longer needed now that the stores don't overlap.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2015-07-15 17:14:57 -07:00
Aaron Lehmann
0ffb2c69d9
Add a check that a root key being imported is encrypted
...
Add unit test coverage that makes this check fail. Also add unit test
coverage for making sure trying to import something that isn't PEM fails
in the expected way.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2015-07-15 17:14:56 -07:00
Aaron Lehmann
479333ca7b
Add ExportRootKey and ImportRootKey functions
...
Also add a unit test
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2015-07-15 17:14:56 -07:00