centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-12 14:25:46 +07:00
Code Issues Packages Projects Releases Wiki Activity
941 Commits 57 Branches 28 Tags
6ebb1fc7a8dffb300b8b7203171d47eaec285b77
Commit Graph

287 Commits

Author SHA1 Message Date
Ying Li
6ebb1fc7a8 Just connect to mysql as root, rather than as dockerdemo user with password. 
Signed-off-by: Ying Li <ying.li@docker.com>
 2015-11-23 18:05:10 -05:00
Diogo Mónica
378888f6d7 Merge pull request #295 from docker/no-stderr-for-cmds 
Set the default output for all cobra commands to be STDOUT
 2015-11-15 13:12:36 +01:00
David Lawrence
d0b3bd2860 headers were still printing when no targets were found 
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
 2015-11-15 02:48:33 -08:00
Ying Li
238ee32c78 Set the default output for all cobra commands to be STDOUT 
Signed-off-by: Ying Li <ying.li@docker.com>
 2015-11-15 02:46:29 -08:00
Diogo Mónica
ebc41c8154 Merge pull request #292 from docker/fix-signer-sign 
The NotarySigner cryptoservice now implements GetPrivateKey.
 2015-11-15 11:33:32 +01:00
Diogo Mónica
04941d90a0 Merge pull request #289 from endophage/pretty_print_targets 
pretty printing targets
 2015-11-15 11:32:02 +01:00
Diogo Mónica
e638f0a4d6 Merge pull request #285 from docker/delete-key-is-back 
Add an interactive command to delete a key from any keystore.
 2015-11-15 11:31:41 +01:00
Ying Li
204a4f1534 The NotarySigner cryptoservice now implements GetPrivateKey. 
Previously, because it's a CryptoService wrapper around a remote signer
service, it returned nil all the time.  Now, because signing is done
via private key more than CryptoService, it has to return a PrivateKey.

The key doesn't have private bytes, but can be used for signing.

Signed-off-by: Ying Li <ying.li@docker.com>
 2015-11-15 01:45:21 -08:00
Ying Li
0d7df87805 Add an interactive command to delete a key from any keystore. 
This lists any matching keys, and requires the user to pick which one
to choose, if there is more than 1 matching key.  Also requires the
user to confirm before deleting.

Signed-off-by: Ying Li <ying.li@docker.com>
 2015-11-14 14:17:08 -08:00
David Lawrence
0088d16bba pretty printing targets 
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
 2015-11-14 10:21:08 -08:00
Diogo Mónica
53626b6fe6 Merge pull request #284 from docker/key-command-renaming 
Rename command line options from export/import key to backup/restore.
 2015-11-14 13:49:53 +01:00
Ying Li
cb6fd71848 Rename command line options from export/import key to backup/restore. 
import-root/export-root have been renamed to import/export.

Signed-off-by: Ying Li <ying.li@docker.com>
 2015-11-14 02:33:36 -08:00
Diogo Mónica
daa844079f Merge pull request #279 from docker/pretty-print 
Pretty print output of `notary key list`.
 2015-11-14 10:55:33 +01:00
Ying Li
eb9de9f0e8 Print out a different message for list keys if no keys are found. 
Signed-off-by: Ying Li <ying.li@docker.com>
 2015-11-13 15:44:56 -08:00
Ying Li
edf0520c9b Remove KeyStoreManager's dependency on a KeyStore. 
The root generation code is handled by CryptoService now.

Signed-off-by: Ying Li <ying.li@docker.com>
 2015-11-13 15:00:45 -08:00
Ying Li
39c682327e Pretty-print the key list in a deterministic sorted order. 
Signed-off-by: Ying Li <ying.li@docker.com>
 2015-11-13 01:41:00 -08:00
Diogo Mónica
b894d98392 Merge pull request #54 from docker/verify_hw_sigs 
add verification to yubikey signatures. Attempt to generate sig up to…

Signed-off-by: David Lawrence <david.lawrence@docker.com>

Signed-off-by: Diogo Mónica <diogo.monica@gmail.com> (github: endophage)
 2015-11-12 01:13:05 -08:00
David Lawrence
9b8645c39f add verification to yubikey signatures. Attempt to generate sig up to 5 times, fail if all 5 are invalid 
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
 2015-11-12 01:13:03 -08:00
David Lawrence
ca7e4c8d38 set withHardware flag to false for export commands. We can never export from hardware 
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
 2015-11-12 01:13:00 -08:00
David Lawrence
8628b57a96 private subdir should be added by keyfilestore, rather than all over the place 
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
 2015-11-12 01:12:57 -08:00
Diogo Monica
4c2fcda620 Addressing small nits 
Signed-off-by: Diogo Monica <diogo@docker.com>
Signed-off-by: David Lawrence <david.lawrence@docker.com>

Signed-off-by: Diogo Monica <diogo@docker.com> (github: endophage)
 2015-11-12 01:12:48 -08:00
Diogo Monica
0344dfc038 Making tests pass 
Signed-off-by: Diogo Monica <diogo@docker.com>
Signed-off-by: David Lawrence <david.lawrence@docker.com>

Signed-off-by: Diogo Monica <diogo@docker.com> (github: endophage)
 2015-11-12 01:12:31 -08:00
Diogo Monica
5b7480f599 Adding default to notary key generate and configurable trust dir from 
config

Signed-off-by: Diogo Monica <diogo.monica@gmail.com>
Signed-off-by: David Lawrence <david.lawrence@docker.com>

Signed-off-by: Diogo Monica <diogo.monica@gmail.com> (github: endophage)
 2015-11-12 01:12:26 -08:00
David Lawrence
ee270b6a2b fixing integrations tests for new list keys layout 
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
 2015-11-12 01:12:21 -08:00
David Lawrence
a21287c0d1 taking out message when yubikey not found 
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
 2015-11-12 01:12:20 -08:00
David Lawrence
6acc130e17 list shows where the key is stored 
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
 2015-11-12 01:12:20 -08:00
Diogo Monica
f9f118d088 Changing env to be TARGETS 
Signed-off-by: David Lawrence <david.lawrence@docker.com>

Signed-off-by: Diogo Monica <diogo.monica@gmail.com> (github: endophage)
 2015-11-12 01:12:04 -08:00
Ying Li
0280a82ae0 Do not back up a root key that is imported into Yubikey. 
Signed-off-by: Ying Li <ying.li@docker.com>
Signed-off-by: David Lawrence <david.lawrence@docker.com>

Signed-off-by: Ying Li <ying.li@docker.com> (github: endophage)
 2015-11-12 01:11:43 -08:00
Ying Li
9a01cf091d Add "notary lookup" to the integration tests. 
Signed-off-by: Ying Li <ying.li@docker.com>
Signed-off-by: David Lawrence <david.lawrence@docker.com>

Signed-off-by: Ying Li <ying.li@docker.com> (github: endophage)
 2015-11-12 01:11:17 -08:00
Ying Li
c82802b800 Move ecdsa_hardware_crypto_service to trustmanager/yubikeystore 
Signed-off-by: Ying Li <ying.li@docker.com>
Signed-off-by: David Lawrence <david.lawrence@docker.com>

Signed-off-by: Ying Li <ying.li@docker.com> (github: endophage)
 2015-11-12 01:10:56 -08:00
Ying Li
4867410e98 Ensure that tests pass and binaries build without the pkcs11 build tag. 
Signed-off-by: Ying Li <ying.li@docker.com>
Signed-off-by: David Lawrence <david.lawrence@docker.com>

Signed-off-by: Ying Li <ying.li@docker.com> (github: endophage)
 2015-11-12 01:10:16 -08:00
Ying Li
087f13ae7d Normalize and elaborate on the command line help. 
Ensures that the notary command line help text start with capital
letters, and add information about hardware keys and online/offline operation.

Signed-off-by: Ying Li <ying.li@docker.com>
Signed-off-by: David Lawrence <david.lawrence@docker.com>

Signed-off-by: Ying Li <ying.li@docker.com> (github: endophage)
 2015-11-12 01:10:03 -08:00
Ying Li
313ae80345 Remove unused rawOutput option in notary CLI. 
Signed-off-by: Ying Li <ying.li@docker.com>
Signed-off-by: David Lawrence <david.lawrence@docker.com>

Signed-off-by: Ying Li <ying.li@docker.com> (github: endophage)
 2015-11-12 01:09:59 -08:00
Ying Li
e4e099ae00 Just ignore the -s notary CLI option instead of erroring. 
Currently commands that do not require online access will error if
this option is passed.  Do not error anymore, just ignore.

Signed-off-by: Ying Li <ying.li@docker.com>
Signed-off-by: David Lawrence <david.lawrence@docker.com>

Signed-off-by: Ying Li <ying.li@docker.com> (github: endophage)
 2015-11-12 01:09:53 -08:00
Ying Li
1f1868d3ee Adding integration tests for notary client. 
This runs through the basic notary init/add/publish/etc. workflow,
and some basic key workflows.

Note that this does work with the Yubikey, in that created keys while
testing do not require touch.

Signed-off-by: Ying Li <ying.li@docker.com>
Signed-off-by: David Lawrence <david.lawrence@docker.com>

Signed-off-by: Ying Li <ying.li@docker.com> (github: endophage)
 2015-11-12 01:09:40 -08:00
David Lawrence
91e8b9bcdb backup to a KeyFileStore and take out key remove 
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
 2015-11-12 01:09:32 -08:00
David Lawrence
f9cf7bcca5 remove needs to list keys to find guns 
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
 2015-11-12 01:09:31 -08:00
David Lawrence
51a99a4127 generate should instantiate a yubikeystore 
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
 2015-11-12 01:09:31 -08:00
David Lawrence
e8d2240c79 write private key to a backup dir when creating keys on yubikey 
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
 2015-11-12 01:09:31 -08:00
David Lawrence
b7c38f0287 fixing tests 
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
 2015-11-12 01:09:31 -08:00
David Lawrence
da18f54699 import-root, list, and remove working with yubikey 
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
 2015-11-12 01:09:31 -08:00
David Lawrence
be4c0669c1 move import/export to cryptoservice and add import to yubikey 
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
 2015-11-12 01:09:31 -08:00
Jessica Frazelle
5f21ebd185 Add pkcs11 build tags 
Add build tags and a check in Makefile to be sure you do not import
pkcs11 lib somewhere where it should not be. This will ensure docker
import and integration will continue to work.

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Signed-off-by: David Lawrence <david.lawrence@docker.com>

Signed-off-by: Jessica Frazelle <acidburn@docker.com> (github: endophage)
 2015-11-12 01:07:00 -08:00
David Lawrence
07f0065152 ask for pin when signing 
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
 2015-11-12 01:06:38 -08:00
Diogo Monica
21138e6bad Working version of Notary and Yubikey 
Signed-off-by: Diogo Monica <diogo@docker.com>

Remove symlinks from notary-client repo creation

Signed-off-by: Ying Li <ying.li@docker.com>
Signed-off-by: Diogo Monica <diogo@docker.com>

WIP

Signed-off-by: Diogo Monica <diogo@docker.com>

working yubikey integration
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)

Fixing small colon bug

Signed-off-by: Diogo Monica <diogo@docker.com>

Added things. Ship it.

Signed-off-by: Diogo Monica <diogo@docker.com>

Bringing ecdsahwcryptosigner to 2015

Signed-off-by: Diogo Monica <diogo@docker.com>

Working version of notary and yubikey

Signed-off-by: Diogo Monica <diogo@docker.com>
 2015-11-12 01:06:09 -08:00
Diogo Mónica
fd0775e1dc Merge pull request #257 from mtrmac/fix-export-root 
Fix (notary key export-root)
 2015-11-01 10:31:29 +00:00
Miloslav Trmač
62dc66e936 Remove key ID from (notary key import-root) 
PR #242 has started requiring a passphrase for the imported key, and
recomputes the key ID, making the command-line argument redundant.  So,
remove it from the command line and from the KeyStoreManager API.

Also updates the comment for KeyStoreManager.ImportRootKey, and changes
(notary key import-root) to refuse unexpected arguments instead of
silently ignoring them.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
 2015-10-30 20:40:03 +01:00
Miloslav Trmač
93c28ccb1b Fix (notary key export-root) 
-c was recently taken over by --configFile; using it for
--change-passphrase as well results in

panic: shorthand redefinition

So, move --change-passphrase to -p.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
 2015-10-30 20:39:20 +01:00
Ying Li
b9a4175ea9 Update the client NotaryRepository to initialize with a root key ID 
Signed-off-by: Ying Li <ying.li@docker.com>
 2015-10-29 15:11:15 -07:00
Ying Li
aa5b621968 Fix import error after rebase 
Signed-off-by: Ying Li <ying.li@docker.com>
 2015-10-28 15:44:33 -07:00