beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
12778 commits 14 branches 412 tags 338 MiB
Commit graph

12778 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alexander Morozov
30293e3fd0 Merge pull request #10321 from titanous/fix-err 
Fix missing err assignment in bridge creation
 2015-01-23 15:07:23 -08:00
Jonathan Rudenberg
d5c78a4c07 Fix missing err assignment in bridge creation 
Signed-off-by: Jonathan Rudenberg <jonathan@titanous.com>
 2015-01-23 14:48:28 -08:00
Michael Crosby
62c50abf13 Merge pull request #10311 from jfrazelle/quiet-logs-registry 
Make debugs logs less verbose for registry
 2015-01-23 13:56:31 -08:00
Jessica Frazelle
c49cd3d2a5 Make debugs logs suck less. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2015-01-23 13:20:29 -08:00
Alexander Morozov
99bffdf10e Merge pull request #10183 from miminar/safe-stop-kill 
Stop and Kill commands made robust
 2015-01-23 06:32:51 -08:00
Michal Minar
310337dc89 Stop and Kill commands made robust 
If stop/kill command hits a short window between process' exit and
container's cleanup, it will no longer fail with 'no such process'
error.

Resolves #10182

Signed-off-by: Michal Minar <miminar@redhat.com>
 2015-01-23 10:26:13 +01:00
James Turnbull
d3a6a53fa5 Merge pull request #10292 from SvenDowideit/pr_out_update_using_supervisord_md 
Update using_supervisord.md
 2015-01-23 00:09:25 -05:00
Sven Dowideit
992beb2a96 Merge pull request #9952 from flowlo/doc-https 
doc: Improve article on HTTPS
 2015-01-23 12:34:57 +10:00
Sven Dowideit
fa79e18c20 Merge pull request #10260 from acbodine/docs_api_attach_websocket 
Adds docs for /containers/(id)/attach/ws api endpoint
 2015-01-23 10:51:11 +10:00
GennadySpb
99dc224d85 Update using_supervisord.md 
Fix factual error

change made by: GennadySpb <lipenkov@gmail.com>

Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
 2015-01-23 10:43:57 +10:00
Jessie Frazelle
54ddb9b41d Merge pull request #10288 from tiborvass/fix-test-attach 
integration-cli: wait for container before sending ^D
 2015-01-22 15:07:46 -08:00
Tibor Vass
a124bfaef3 integration-cli: wait for container before sending ^D 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2015-01-22 17:28:35 -05:00
Arnaud Porterie
5a6f84ce08 Merge pull request #10282 from tiborvass/fix-test-restart-policy-always 
integration-cli: Fix race in restart loop
 2015-01-22 13:17:23 -08:00
Lorenz Leutgeb
a51554988e Fix inconsistent formatting 
Colon was bold, but regular at other occurences.

Blame cf27b310c4

Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
 2015-01-22 21:46:01 +01:00
Lorenz Leutgeb
048b20e58a doc: Minor semantical/editorial fixes in HTTPS article 
"read-only" vs. "only readable by you"

Refer to:
https://github.com/docker/docker/pull/9952#discussion_r22690266

Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
 2015-01-22 21:37:39 +01:00
Lorenz Leutgeb
6ca2875e58 doc: Editorial changes as suggested by @fredlf 
Refer to:
 * https://github.com/docker/docker/pull/9952#discussion_r22686652
 * https://github.com/docker/docker/pull/9952#discussion_r22686804

Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
 2015-01-22 21:37:39 +01:00
Lorenz Leutgeb
02a793c6a1 doc: Improve article on HTTPS 
* Adjust header to match _page_title
 * Add instructions on deletion of CSRs and setting permissions
 * Simplify some path expressions and commands
 * Consqeuently use ~ instead of ${HOME}
 * Precise formulation ('key' vs. 'public key')
 * Fix wrong indentation of output of `openssl req`
 * Use dash ('--') instead of minus ('-')

Remark on permissions:

It's not a problem to `chmod 0400` the private keys, because the
Docker daemon runs as root (can read the file anyway) and the Docker
client runs as user.

Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
 2015-01-22 21:37:39 +01:00
Arnaud Porterie
10ab6dcb4f Merge pull request #10234 from dmcgowan/libtrust-key-fix 
Fix daemon key file location
 2015-01-22 11:54:03 -08: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
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
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
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
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
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
Victor Vieux
9c7689a10e bump API version 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-01-22 01:15:34 +00: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
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
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
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
Stephen J Day
4e4a5b2532 Ensure that progress reader is closed after usage 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2015-01-21 15:14:01 -08:00
Derek McGowan
12d83e727d Fix write after close on http response 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-01-21 15:14:01 -08:00
Jessie Frazelle
f1bc0376b8 Merge pull request #10254 from LK4D4/fix_etchosts_rewriting 
Fix etchosts rewriting
 2015-01-21 15:08:45 -08:00
Alexander Morozov
606c71d424 Test for updating linked hosts on restart 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-01-21 14:34:40 -08:00
Alexander Morozov
c2a25058e8 Update links aliases, not name on restart 
Fixes #8721

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-01-21 14:34:27 -08:00
Michael Crosby
edaf23b7a7 Merge pull request #10145 from duglin/Issue10141 
Docker run -e FOO should erase FOO if FOO isn't set in client env
 2015-01-21 14:16:51 -08:00
Michael Crosby
b8fe989b9b Merge pull request #10187 from jfrazelle/update-skip-graphtest 
update graphtest
 2015-01-21 14:09:16 -08:00
Michael Crosby
12dd9af951 Merge pull request #10243 from cpuguy83/10242_fix_stat_on_err 
Fix call to nil stat
 2015-01-21 13:55:39 -08:00
Jessie Frazelle
649ad2d56e Merge pull request #10246 from crosbymichael/stats-edits 
Update to docker stats documentation post review
 2015-01-21 13:14:22 -08:00
Michael Crosby
db9b1e3654 Update to docker stats documentation 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-01-21 11:44:23 -08:00