1
0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Commit Graph

47845 Commits

Author SHA1 Message Date
Andrea Luzzardi
3106f042c0 Merge pull request #276 from vieux/cleanup_discovery
Cleanup discovery
2015-01-22 11:53:29 -08:00
Victor Vieux
a12c8ff87e add consul to usage
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-22 19:40:36 +00:00
Victor Vieux
ecb47032bd fix panics in etcd and zookeeper + add tests
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-22 19:40:24 +00:00
Derek McGowan
d55e977cf5 Fix nits and defers
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-01-22 11:22:31 -08:00
Jessie Frazelle
211513156d Merge pull request #10259 from jfrazelle/wording-of-image-verification
Change the wording of image verification warning.
2015-01-22 11:14:28 -08:00
Tibor Vass
752a0d6f34 integration-cli: Fix race in restart loop
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2015-01-22 14:06:24 -05:00
Derek McGowan
42612ff6db Add key migration integration test
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-01-22 10:51:04 -08:00
Simon Thulbourn
4ee78fa097 Change binary name to docker-machine
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
2015-01-22 18:50:08 +00:00
Derek McGowan
a34a7930b5 Add TODO lines for windows
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-01-22 10:29:15 -08:00
Jessie Frazelle
c77c67cf87 Merge pull request #10266 from bobrik/no-extra-assertion
Not doing extra assertion for io.Closer
2015-01-22 10:25:23 -08:00
Arnaud Porterie
ef33efc9b9 Merge pull request #10244 from dmcgowan/registry-panic-fix
Fix write after close on http response
2015-01-22 10:23:11 -08:00
Daniel Nephin
ef027599f7 Merge pull request #871 from albers/bash-completion
Rebrand bash completion script
2015-01-22 12:52:27 -05:00
Evan Hazlett
29c1eb9080 Merge pull request #292 from radeksimko/bin_name_fix
Use actual binary name instead of hardcoding it
2015-01-22 12:44:26 -05:00
Alexander Morozov
4aa60a902a Merge pull request #10250 from crosbymichael/stats-test
Improve robustness of /stats api test
2015-01-22 09:09:03 -08:00
Jeffrey Morgan
11471b626a Transition to newly created containers 2015-01-22 10:59:25 -05:00
Jeffrey Morgan
638d6b71f9 Transition to newly created containers 2015-01-22 10:59:25 -05:00
Harald Albers
f1e4fb7736 Rebrand bash completion script
Signed-off-by: Harald Albers <github@albersweb.de>
2015-01-22 16:07:11 +01:00
Ian Babrou
4d10b32380 Not doing extra assertion for io.Closer
Signed-off-by: Ian Babrou <ibobrik@gmail.com>
2015-01-22 10:36:20 +03:00
Abin Shahab
9c744cb454 Fixes apparmor regression
Signed-off-by: Abin Shahab <ashahab@altiscale.com> (github: ashahab-altiscale)
Docker-DCO-1.1-Signed-off-by: Abin Shahab <ashahab@altiscale.com> (github: ashahab-altiscale)
2015-01-22 07:06:46 +00:00
Jeffrey Morgan
538951109d Adding BitHound badge 2015-01-21 23:19:47 -05:00
Jeffrey Morgan
ddc621d69a Adding BitHound badge 2015-01-21 23:19:47 -05:00
Jeffrey Morgan
428aebec6a Cleaning up old meteor code 2015-01-21 23:17:57 -05:00
Jeffrey Morgan
b010c3eeed Cleaning up old meteor code 2015-01-21 23:17:57 -05:00
Andrew C. Bodine
51060ee07a Adds docs for /containers/(id)/attach/ws api endpoint
Signed-off-by: Andrew C. Bodine <acbodine@us.ibm.com>
2015-01-21 18:37:08 -08:00
Andrew C. Bodine
9e37a04665 Adds test for api attach via websocket
Signed-off-by: Andrew C. Bodine <acbodine@us.ibm.com>
2015-01-21 18:35:51 -08:00
Jeffrey Morgan
521793589b Refactored out Meteor into React.js. WIP 2015-01-21 21:09:12 -05:00
Jeffrey Morgan
db38e51128 Refactored out Meteor into React.js. WIP 2015-01-21 21:09:12 -05:00
Jessica Frazelle
c97d8b1233 Change the wording of image verification warning.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2015-01-21 18:07:10 -08:00
Michael Crosby
3c77e7d634 Merge pull request #10257 from vieux/lol
bump API version
2015-01-21 17:51:27 -08:00
Jeffrey Morgan
b28c27455f Removing active event from ContainerStore 2015-01-21 20:48:03 -05:00
Jeffrey Morgan
72ccbc6c35 Removing active event from ContainerStore 2015-01-21 20:48:03 -05:00
Victor Vieux
29bbf0fb27 Merge pull request #270 from aluzzardi/loglevel
Replace --debug with --log-level
2015-01-21 17:45:22 -08:00
Andrea Luzzardi
8d3d71ba41 Re-add support for --debug.
If --debug is set (or $DEBUG) and no log level was specified, enforce
log-level=debug.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-21 17:38:54 -08:00
Andrea Luzzardi
c2d527c9c6 Merge pull request #269 from vieux/add_stats
add docker stats support
2015-01-21 17:31:04 -08:00
Andrea Luzzardi
7dd2d2440b Merge pull request #271 from vieux/history_inspect
add support for history, inspect for images and improve inspect for containers
2015-01-21 17:26:50 -08:00
Victor Vieux
9c7689a10e bump API version
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-22 01:15:34 +00:00
Andrew C. Bodine
d25a65375c Closes #9311 Handles container id/name collisions against daemon functionalities according to #8069
Signed-off-by: Andrew C. Bodine <acbodine@us.ibm.com>
2015-01-21 17:11:31 -08:00
Jessie Frazelle
fcc4abc870 Merge pull request #10225 from vbatts/vbatts-init_mount_namespaces
daemon mount namespaces
2015-01-21 16:55:15 -08:00
Derek McGowan
007ef161b4 Add key migration to daemon
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-01-21 16:55:05 -08:00
Victor Vieux
2e968d7800 add support for history, inspect for images and improve inspect for containers
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-22 00:49:02 +00:00
Derek McGowan
06af013f8b Fix daemon key file location
Fixes #10233

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-01-21 16:28:19 -08:00
Arnaud Porterie
e13559a6d6 Merge pull request #10235 from jfrazelle/tech-preview-warning
Warn about tech preview of image verification.
2015-01-21 16:24:00 -08:00
Jessica Frazelle
614e09a8c7 Add test for pull verified
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2015-01-21 16:25:01 -08:00
Jessica Frazelle
1820003078 Warn about tech preview of checksums.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2015-01-21 16:25:01 -08:00
Jessie Frazelle
0f5eba68fb Merge pull request #10251 from crosbymichael/stats-zero
Zero out stats values in the cli
2015-01-21 16:16:55 -08:00
Andrea Luzzardi
5200e3e764 Replace --debug with --log-level
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-21 16:16:44 -08:00
Michael Crosby
4d7707e183 Improve robustness of /stats api test
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-01-21 16:00:15 -08:00
Victor Vieux
027f8ed44a add docker rename support
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-21 23:51:36 +00:00
Stephen Day
686da01dd7 Merge pull request #93 from BrianBland/config-test
Adds test for extraneous configuration environment variables
2015-01-21 15:40:14 -08:00
Michael Crosby
bbc38497b6 Zero out stats values in the cli
Based on some feedback, when you have a container via the cli that you
are monitoring for stats, if you stop the container it will stay in the
display but report the last datapoint that was received.

This PR changes the display to zero out the values for containers where
an update has not been received within a specified duration, i.e. 2
seconds.  This signals the user that the container has stopped as it
reports cpu and memory usage of 0.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-01-21 15:33:53 -08:00