34351a6734
Add build flag to exec test.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: ecdbc1a0aff40fa28389d1971528641e2824e5a9
Component: engine
2015-01-23 16:18:39 -08:00
3e848a2a63
Move InspectExecID test to exec.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 957cbdbf302750f3fb3467237bebf29d87234208
Component: engine
2015-01-23 16:18:39 -08:00
cc1de71aa0
Fix missing err assignment in bridge creation
...
Signed-off-by: Jonathan Rudenberg <jonathan@titanous.com >
Upstream-commit: d5c78a4c07929eda2d448f9b2a09fb3d65a75a2d
Component: engine
2015-01-23 14:48:28 -08:00
1c5b6614c3
Make debugs logs suck less.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: c49cd3d2a51ad6d2304c24f7b609cde804a0d6c5
Component: engine
2015-01-23 13:20:29 -08:00
28feccbe1b
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 >
Upstream-commit: 310337dc89a78cbe245977236f02dcda73728df8
Component: engine
2015-01-23 10:26:13 +01:00
dfa9fbab62
Merge pull request #10292 from SvenDowideit/pr_out_update_using_supervisord_md
...
Update using_supervisord.md
Upstream-commit: d3a6a53fa5d399ed0d728e48eed8ea38bca9dc2c
Component: engine
2015-01-23 00:09:25 -05:00
a15322433b
Merge pull request #9952 from flowlo/doc-https
...
doc: Improve article on HTTPS
Upstream-commit: 992beb2a962a38e7958c14f6188098fe1814c9aa
Component: engine
2015-01-23 12:34:57 +10:00
bf1ffd6668
Merge pull request #10260 from acbodine/docs_api_attach_websocket
...
Adds docs for /containers/(id)/attach/ws api endpoint
Upstream-commit: fa79e18c20b5ce1c7a6c2c70e5e120d73a59e165
Component: engine
2015-01-23 10:51:11 +10:00
422d703cc0
Update using_supervisord.md
...
Fix factual error
change made by: GennadySpb <lipenkov@gmail.com >
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
Upstream-commit: 99dc224d850a8838f42b9f41229b484197f75fa5
Component: engine
2015-01-23 10:43:57 +10:00
da0e87ebb9
Merge pull request #10288 from tiborvass/fix-test-attach
...
integration-cli: wait for container before sending ^D
Upstream-commit: 54ddb9b41d550fea021efb9f77b7993acf3d6f75
Component: engine
2015-01-22 15:07:46 -08:00
551d8c12b8
integration-cli: wait for container before sending ^D
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: a124bfaef37a9d209de881325dbe653d9b07ef4d
Component: engine
2015-01-22 17:28:35 -05:00
a5a927b102
Merge pull request #10282 from tiborvass/fix-test-restart-policy-always
...
integration-cli: Fix race in restart loop
Upstream-commit: 5a6f84ce089f7a562010564ad7e2ebcb60a39d5d
Component: engine
2015-01-22 13:17:23 -08:00
3685fbd1c9
Fix inconsistent formatting
...
Colon was bold, but regular at other occurences.
Blame cf27b310c4fc8d2c13ba181398a628d03e1e3c58
Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com >
Upstream-commit: a51554988e615b317e95125f5612a28c3bff8e8a
Component: engine
2015-01-22 21:46:01 +01:00
f5baf563e6
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 >
Upstream-commit: 048b20e58a1b9d516dd6fb34676d765ebd5a8959
Component: engine
2015-01-22 21:37:39 +01:00
1894376959
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 >
Upstream-commit: 6ca2875e580e16a309eb9c9486bb358bde3622ff
Component: engine
2015-01-22 21:37:39 +01:00
a50020fe51
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 >
Upstream-commit: 02a793c6a133f46129d0fc83ce218d3a92f1e644
Component: engine
2015-01-22 21:37:39 +01:00
7a156f1702
Merge pull request #10234 from dmcgowan/libtrust-key-fix
...
Fix daemon key file location
Upstream-commit: 10ab6dcb4f8f63ffab44023d286403c494fa24b8
Component: engine
2015-01-22 11:54:03 -08:00
64ed8c80ae
Fix nits and defers
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: d55e977cf5963f8ae5efdfbee458727f704be398
Component: engine
2015-01-22 11:22:31 -08:00
e1654ed3ab
Merge pull request #10259 from jfrazelle/wording-of-image-verification
...
Change the wording of image verification warning.
Upstream-commit: 211513156dc1ace48e630b4bf4ea0fcfdc8d9abf
Component: engine
2015-01-22 11:14:28 -08:00
4cb12b37f1
integration-cli: Fix race in restart loop
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: 752a0d6f34ee3c92dc877273c33b8cd0239fda71
Component: engine
2015-01-22 14:06:24 -05:00
54a3834558
Add key migration integration test
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 42612ff6dba2d885a0c55af80128201a4d5166cb
Component: engine
2015-01-22 10:51:04 -08:00
d625ce9494
Add TODO lines for windows
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: a34a7930b5c1e9a1e6ddd4a40b1810a86f7d24ab
Component: engine
2015-01-22 10:29:15 -08:00
e6b4861d6f
Merge pull request #10266 from bobrik/no-extra-assertion
...
Not doing extra assertion for io.Closer
Upstream-commit: c77c67cf87f77ad4da46ade515a4c912a3c612d9
Component: engine
2015-01-22 10:25:23 -08:00
4f2ab4bd87
Merge pull request #10244 from dmcgowan/registry-panic-fix
...
Fix write after close on http response
Upstream-commit: ef33efc9b9879a8397288b1bd54d8f3fd2460e56
Component: engine
2015-01-22 10:23:11 -08:00
d18e557951
Merge pull request #10250 from crosbymichael/stats-test
...
Improve robustness of /stats api test
Upstream-commit: 4aa60a902a03294d8009747f3fc1ba26bb2fd27e
Component: engine
2015-01-22 09:09:03 -08:00
ce792ad046
Not doing extra assertion for io.Closer
...
Signed-off-by: Ian Babrou <ibobrik@gmail.com >
Upstream-commit: 4d10b32380793ce5e324a429ce2db60125aae205
Component: engine
2015-01-22 10:36:20 +03:00
5c5aa72c84
Adds docs for /containers/(id)/attach/ws api endpoint
...
Signed-off-by: Andrew C. Bodine <acbodine@us.ibm.com >
Upstream-commit: 51060ee07aaf3ff10ac7187558bd665f4ddd3507
Component: engine
2015-01-21 18:37:08 -08:00
72b2fe27b4
Change the wording of image verification warning.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: c97d8b1233bc17a9e58ce97473329ab5de59969a
Component: engine
2015-01-21 18:07:10 -08:00
fd76e3bccd
bump API version
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 9c7689a10e60cd921e1521c729c07184b7c1076c
Component: engine
2015-01-22 01:15:34 +00:00
331f9fe663
Merge pull request #10225 from vbatts/vbatts-init_mount_namespaces
...
daemon mount namespaces
Upstream-commit: fcc4abc870e7f62590e418f10ff6f743a47fad12
Component: engine
2015-01-21 16:55:15 -08:00
0d4aa9a72d
Add key migration to daemon
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 007ef161b45dd91afcfb7ef9cd32e6c88dbf196e
Component: engine
2015-01-21 16:55:05 -08:00
c5219e9048
Fix daemon key file location
...
Fixes #10233
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 06af013f8bdf5c9af85c4b3f158292d79ab644a5
Component: engine
2015-01-21 16:28:19 -08:00
ee34de2e39
Merge pull request #10235 from jfrazelle/tech-preview-warning
...
Warn about tech preview of image verification.
Upstream-commit: e13559a6d69b8c192ba2e0605f956ae84d1eb0db
Component: engine
2015-01-21 16:24:00 -08:00
f6fc27f6b6
Add test for pull verified
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 614e09a8c7990e05509edb4c335c4b59001cea61
Component: engine
2015-01-21 16:25:01 -08:00
366e7721bb
Warn about tech preview of checksums.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 1820003078eeae6ab25e2440669c490caff59b57
Component: engine
2015-01-21 16:25:01 -08:00
13d7d6cab3
Merge pull request #10251 from crosbymichael/stats-zero
...
Zero out stats values in the cli
Upstream-commit: 0f5eba68fbe4904090532a709e7f3769059bc0aa
Component: engine
2015-01-21 16:16:55 -08:00
9381b90c95
Improve robustness of /stats api test
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 4d7707e183e8dcb8e0ab1415e401cb530df17c92
Component: engine
2015-01-21 16:00:15 -08:00
7304bd6808
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 >
Upstream-commit: bbc38497b6f522b0a9c4e5e976abfd79692b8b5f
Component: engine
2015-01-21 15:33:53 -08:00
bde8dbe0df
Ensure that progress reader is closed after usage
...
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: 4e4a5b25328566efad9ade3e7e0737ba48c090ab
Component: engine
2015-01-21 15:14:01 -08:00
c43f530252
Fix write after close on http response
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 12d83e727dd3522006b53afbcfac3cdce178117a
Component: engine
2015-01-21 15:14:01 -08:00
05dc63ed6e
Merge pull request #10254 from LK4D4/fix_etchosts_rewriting
...
Fix etchosts rewriting
Upstream-commit: f1bc0376b822128888a825c5607cee1d861e1c0b
Component: engine
2015-01-21 15:08:45 -08:00
0bd257dcc5
Test for updating linked hosts on restart
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 606c71d424cb21c8256968eb5d965a0855d1af2d
Component: engine
2015-01-21 14:34:40 -08:00
d1daac3149
Update links aliases, not name on restart
...
Fixes #8721
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: c2a25058e8c85b4d6295c6a1375c0b70b0959260
Component: engine
2015-01-21 14:34:27 -08:00
32b5682b75
Merge pull request #10145 from duglin/Issue10141
...
Docker run -e FOO should erase FOO if FOO isn't set in client env
Upstream-commit: edaf23b7a7f71626bdafb4e3a9677ad05fa17cab
Component: engine
2015-01-21 14:16:51 -08:00
f3e1447653
Merge pull request #10187 from jfrazelle/update-skip-graphtest
...
update graphtest
Upstream-commit: b8fe989b9b825d76cdcbd4017a26e18257e10ac1
Component: engine
2015-01-21 14:09:16 -08:00
86dcbf6d0b
Merge pull request #10243 from cpuguy83/10242_fix_stat_on_err
...
Fix call to nil stat
Upstream-commit: 12dd9af95144c4047df8748567ed4a197dba769c
Component: engine
2015-01-21 13:55:39 -08:00
f0170e8737
Update to docker stats documentation
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: db9b1e3654464b0e7008fbad15d43fbbba87b1a4
Component: engine
2015-01-21 11:44:23 -08:00
5752ad288d
Fix call to nil stat
...
Fixes #10242
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 811b138f7e6c742b821da15e34338651f33f9ec2
Component: engine
2015-01-21 14:25:35 -05:00
dcea23baf1
Merge pull request #10231 from estesp/move-iptables-check
...
Move iptables check out of runtime init() to separate function
Upstream-commit: f3aed2a2974bba4fdca947227d877bcc2c7d540b
Component: engine
2015-01-21 10:46:40 -08:00
865afbd584
Merge pull request #10196 from bobrik/unused-compression-arg
...
Removed unused compression arg in Graph.TempLayerArchive()
Upstream-commit: fd6bd8090927bbaf37682fe079a39a2fdb0f74a9
Component: engine
2015-01-21 09:27:32 -08:00
