Michael Crosby
ed8e89c54d
Merge pull request #10309 from cpuguy83/fix_bind_vol_partially_removed
...
Fix bind-mounts only partially removed
2015-01-26 11:53:08 -08:00
Jessie Frazelle
8b031eb892
Merge pull request #10331 from DiuDiugirl/master
...
Fix a minor typo
2015-01-26 11:52:18 -08:00
Michael Crosby
364c64cf1a
Merge pull request #10295 from ashahab-altiscale/9875-lxc-exit-code
...
Adds ipc namespace capability to lxc, and fixes tests.
2015-01-26 11:21:48 -08:00
Michael Crosby
a3c5223b2a
Merge pull request #10194 from jfrazelle/lxc-test-fixes
...
ignore exec tests when passing DOCKER_EXECDRIVER lxc
2015-01-26 11:07:52 -08:00
Brian Goff
b4283209d5
Fix bind-mounts only partially removed
...
When calling delete on a bind-mount volume, the config file was bing
removed, but it was not actually being removed from the volume index.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-01-26 12:38:20 -05:00
Arnaud Porterie
94e169b44f
Merge pull request #10290 from tianon/sorry-windows-norelease4u
...
Remove windows from the list of supported platforms
2015-01-26 08:44:08 -08:00
James Turnbull
283597ad37
Merge pull request #10333 from jlhawn/image_json_schema_reword
...
Updated image spec docs to clarify image JSON
2015-01-26 07:49:44 -05:00
unclejack
8d5774e60b
Merge pull request #10330 from unclejack/remove_autodetect_log
...
pkg/archive: remove tar autodetection log line
2015-01-26 07:25:22 +02:00
Jessie Frazelle
b1f2fdeee2
Merge pull request #10219 from albers/bash-completion
...
Bash completion for the daemon flags
2015-01-25 10:25:22 -08:00
Josh Hawn
71763636f2
Updated image spec docs to clarify image JSON
...
The title `Image JSON Schema` was used as a header in the section
which describes the layout and fields of the image metadata JSON
file. It was pointed out that `JSON Schema` is its own term for
describing JSON in a machine-and-human-readable format, while the
word "Schema" in this context was used more generically to say that
the section is meant to be an example and outline of the Image JSON.
http://spacetelescope.github.io/understanding-json-schema/
This section now has the title `Image JSON Description` in order
to not cause this confusion.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2015-01-24 10:21:11 -08:00
DiuDiugirl
471006c02f
Fix a minor typo
...
Docker inspect can also be used on images, this patch fixed the
minor typo in file docker/flags.go and docs/man/docker.1.md
Signed-off-by: DiuDiugirl <sophia.wang@pku.edu.cn>
2015-01-24 15:08:33 +08:00
unclejack
990a3e30fa
Merge pull request #10315 from jfrazelle/overlay-zfs
...
Blacklist zfs with overlay
2015-01-24 09:04:37 +02:00
unclejack
a5cc1c556d
pkg/archive: remove tar autodetection log line
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2015-01-24 08:43:03 +02:00
Jessica Frazelle
43d1c20101
Move links exec test & exec dir test.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2015-01-23 16:20:46 -08:00
Jessica Frazelle
547c959576
Update project/make.sh to use execdriver buildtag if passed.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2015-01-23 16:18:39 -08:00
Jessica Frazelle
ecdbc1a0af
Add build flag to exec test.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2015-01-23 16:18:39 -08:00
Jessica Frazelle
957cbdbf30
Move InspectExecID test to exec.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2015-01-23 16:18:39 -08:00
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
Jessica Frazelle
ec953b0e7b
Blacklist zfs with overlay
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2015-01-23 14:00:15 -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
Tianon Gravi
47769994e5
Remove windows from the list of supported platforms
...
Since it can still be tested natively without this, this won't cause any harm while we fix the tests to actually work on Windows.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-01-22 15:42:17 -07: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