Hu Keping
09eedc35b2
Rework docker cli history
...
The implementation of `history` is a little redundant espacially
when user set the `--human` and/or `--no-trunc` options.
There are too many conditionals for `human`, `no-trunc` and `quiet` which
I think is useless and complicated.
Since `quiet` will only display the container IDs so it could be not
nested with the other options.
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-10-29 17:59:07 +08:00
David Gageot
d855c35059
Merge pull request #2112 from dgageot/gce-driver-lost-commits
...
Gce driver lost commits
2015-10-29 10:17:50 +01:00
David Gageot
b213da0961
Use PreCreateCheck to check the project/credentials
...
Signed-off-by: David Gageot <david@gageot.net >
2015-10-29 10:05:24 +01:00
David Gageot
8e7a85b8b9
Fix the doc. It should be "Project ID"
...
Signed-off-by: David Gageot <david@gageot.net >
2015-10-29 10:05:19 +01:00
David Gageot
e53b52de03
Improve documentation for google driver
...
Signed-off-by: David Gageot <david@gageot.net >
2015-10-29 10:05:13 +01:00
Jess Frazelle
8e144e6c50
Merge pull request #17471 from jfrazelle/fix-userns
...
fix experimental tests
2015-10-29 00:10:08 -07:00
Jessica Frazelle
44da86172a
fix experimental tests
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-10-28 21:14:45 -07:00
Ying Li
8696c64d12
Add prometheus as a dependency
...
Signed-off-by: Ying Li <ying.li@docker.com >
2015-10-28 20:21:45 -07:00
Viktor Stanchev
42f08cd522
documentation fixes
2015-10-28 19:38:21 -07:00
David Lawrence
b7ce16ab6f
fixes for Diogo's comments
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2015-10-28 19:24:51 -07:00
Jess Frazelle
965706245b
Merge pull request #17462 from LK4D4/fix_device_tool
...
Fix docker-device-tool
2015-10-28 18:56:54 -07:00
Aaron Lehmann
985ee759e7
Use correct regexp in reference.WithTag
...
This was using a different regexp from the intended one. This meant that
tags with uppercase characters were not accepted.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2015-10-28 18:22:00 -07:00
Lei Jitang
de1d611990
Add show error when attach to a paused container
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-10-28 21:00:09 -04:00
David Calavera
0e1618db19
Merge pull request #17437 from LK4D4/put_error
...
Do not ignore error from driver.Put
2015-10-28 17:32:03 -07:00
Alexander Morozov
584bdaf5d9
Fix docker-device-tool
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-10-28 16:43:53 -07:00
David Calavera
7de2b49ac8
Merge pull request #17458 from LK4D4/unnec_err
...
Remove unnecessary error returns
2015-10-28 16:25:40 -07:00
David Lawrence
ca7988d642
fixing lint + vet things
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2015-10-28 16:20:08 -07:00
Derek McGowan
48e7f7963e
Fix rmi -f removing multiple tags
...
When an image has multiple tags and rmi is called with force on a tag, only the single tag should be removed.
The current behavior is broken and removes all tags and the image.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-10-28 16:07:02 -07:00
David Lawrence
f73560d839
creating concrete types for the various key ciphers
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2015-10-28 16:02:55 -07:00
Diogo Mónica
570ef86584
Merge pull request #233 from cyli/codecov
...
Use make targets in circleci, more complete coverage
2015-10-28 15:55:33 -07:00
Diogo Mónica
6dcad7860f
Merge pull request #237 from cyli/mutual-auth
...
Support mutual authentication between the server and signer
2015-10-28 15:55:24 -07:00
Doug Davis
b6e1f4dd69
Merge pull request #16898 from hqhq/hq_bump_bolt
...
Bump bolt to v1.1.0
2015-10-28 18:51:23 -04:00
French Ben
f15c523080
Merge pull request #1152 from FrenchBen/1151-pagination
...
Added reset of pagination for new search. Fixes #1151
2015-10-28 15:47:56 -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
Ying Li
adda5776cb
Use ListenAndServeTLS with blank args, since ListenAndServe doesn't actually set up TLS
...
Signed-off-by: Ying Li <ying.li@docker.com >
2015-10-28 15:42:36 -07:00
Ying Li
126691ac9e
Update the notary server and signer configs to make use of client authentication.
...
Signed-off-by: Ying Li <ying.li@docker.com >
2015-10-28 15:42:33 -07:00
Ying Li
34aecae033
Split out parsing the client TLS in notary-server.
...
Signed-off-by: Ying Li <ying.li@docker.com >
2015-10-28 15:40:41 -07:00
Ying Li
04a78e720f
Factor out and test TLS configuration in notary-server.
...
Signed-off-by: Ying Li <ying.li@docker.com >
2015-10-28 15:39:52 -07:00
Ying Li
bbf941d198
Allow client CAs to be provided to notary-signer.
...
Signed-off-by: Ying Li <ying.li@docker.com >
2015-10-28 15:39:52 -07:00
Diogo Mónica
0a3025c959
Merge pull request #235 from HuKeping/update-readme
...
Docs: update readme
2015-10-28 15:36:59 -07:00
Victor Vieux
d2c5446ea0
Merge pull request #1340 from jimmyxian/volume-driver
...
Move VolumeDriver to HostConfig
2015-10-28 15:28:53 -07:00
Nathan LeClaire
c660130f17
Merge pull request #2109 from nathanleclaire/rm_redundant_errlog
...
Remove redundant error log
2015-10-28 15:22:23 -07:00
Nathan LeClaire
232c611464
Merge pull request #2087 from dgageot/gce-default-auth
...
Use Google default authentication
2015-10-28 15:18:24 -07:00
Alexander Morozov
990655448d
Remove unnecessary error returns
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-10-28 15:15:22 -07:00
Nathan LeClaire
cf83277557
Merge pull request #2107 from dgageot/2093-vtx-warning
...
FIX #2093 warn in case we think VT-X is not enabled.
2015-10-28 15:08:05 -07:00
Daniel Nephin
a71d9af522
Disable a test against docker 1.8.3 because it fails due to a bug in docker engine.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-10-28 17:54:38 -04:00
French Ben
9f05ce192e
Added reset of pagination for new search. Fixes #1151
...
Signed-off-by: French Ben <me+git@frenchben.com >
2015-10-28 14:37:47 -07:00
David Gageot
970c630fd3
FIX #2093 warn in case we think VT-X is not enabled.
...
Signed-off-by: David Gageot <david@gageot.net >
2015-10-28 22:22:04 +01:00
David Gageot
77c2bbcdd2
FIX #2023 and #1061 Use google default authentication
...
Signed-off-by: David Gageot <david@gageot.net >
2015-10-28 22:16:22 +01:00
Nathan LeClaire
c04eb43021
Remove redundant error log
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-10-28 13:56:29 -07:00
David Calavera
54d42f4a10
Merge pull request #17424 from coolljt0725/fix_inspect_gateway_value
...
Fix docker inspect display odd gateway value for none network mode
2015-10-28 13:39:59 -07:00
Jeffrey Morgan
c1b9dc5fce
Bump to 0.9.3
...
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com >
2015-10-28 13:27:01 -07:00
Jeffrey Morgan
583af26789
On upgrade, stop machine in debug mode
...
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com >
2015-10-28 13:24:09 -07:00
Richard Scothern
987a69dd05
Merge pull request #1096 from aaronlehmann/simplify-proxy-scheduler
...
Simplify proxy scheduler
2015-10-28 13:23:00 -07:00
Arthur Baars
59784ecdd0
Storage driver for: Google Cloud Storage (gcs)
...
Signed-off-by: Arthur Baars <arthur@semmle.com >
2015-10-28 20:21:56 +00:00
David Lawrence
daa36b43b7
Merge pull request #242 from docker/unify-root-nonroot-keystore
...
Unify root nonroot keystore
2015-10-28 13:14:19 -07:00
David Lawrence
ccb2e1a8f4
Merge pull request #241 from endophage/include_gotuf
...
Include gotuf in notary
2015-10-28 13:13:48 -07:00
Viktor Stanchev
3381ef1a52
update dockerfile, notary docs
2015-10-28 13:06:41 -07:00
Dong Chen
c9f3471dba
add engine options for refresh interval
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
2015-10-28 12:56:48 -07:00
Ying Li
6150c931dd
Make a keysMap rather than just declaring
...
Signed-off-by: Ying Li <ying.li@docker.com >
2015-10-28 12:47:42 -07:00