06d35a04d8
fix panic in monitor
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 1dfc44073399aadb226c1b4c1909fb15c033d44a
Component: engine
2014-03-17 19:33:40 +00:00
8d099b8012
Gofmt imports
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 2bddcd68b4b927d36ffadd80e098f6d4ae2cf5d6
Component: engine
2014-03-17 11:41:28 -07:00
742b723fc2
Move graphdrivers into runtime top level pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 96c4816cef592a98a235010924bb2417c8451079
Component: engine
2014-03-17 11:40:12 -07:00
68860e9695
Move execdrivers into runtime top level pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: af385151ceedde097eda8a5195b431e8076cf76b
Component: engine
2014-03-17 11:40:12 -07:00
4b7a6e2613
Move networking drivers into runtime top level pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 2230c9b9a735d731cc2fee4137633eb98b9da9d5
Component: engine
2014-03-17 11:40:12 -07:00
063cfadb64
Merge pull request #4701 from erikh/4099-non_existent_file_no_error
...
Fix `docker cp` trying to untar files that do not exist.
Upstream-commit: 2ada6441db6ac42abd42ac6ac7ad7439da123d0e
Component: engine
2014-03-17 20:38:26 +02:00
a3b952c15e
Merge pull request #4364 from vieux/move_clone
...
move git clone from daemon to client
Upstream-commit: f9bd6c860d2b07bd44f3dff98255bce34ded883b
Component: engine
2014-03-17 11:36:56 -07:00
4ff432cad1
Merge pull request #4645 from crosbymichael/add-logger
...
Add logger to libcontainer
Upstream-commit: 597e0812fb8a40cf73388bcc44e6be74035a9846
Component: engine
2014-03-17 11:30:14 -07:00
6fae2857fa
Merge pull request #4720 from vieux/fix_content-type_cp
...
fix content-type detection in docker cp
Upstream-commit: d81021803820b807875ef76676d723eee5b0faee
Component: engine
2014-03-17 11:24:18 -07:00
f1b6288e96
Merge pull request #4719 from philips/Capabilities-to-CapabilitiesMask
...
refactor(libcontainer): rename to CapabilitiesMask
Upstream-commit: 73f5aa87af0feb22570d1ea1b71ac58b874ac4cd
Component: engine
2014-03-17 11:15:29 -07:00
b1507c6b21
chore(libcontainer): small grammar fix in types_test
...
Someone probably got really used to typing er on the end of contain :)
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
Upstream-commit: ad7e7d612390d09d3a54fd82dda9687deb3b0cbe
Component: engine
2014-03-17 11:07:29 -07:00
ba77c9041d
refactor(libcontainer): rename to CapabilitiesMask
...
The Capabilities field on libcontainer is actually used as a mask.
Rename the field so that this is more clear.
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
Upstream-commit: 128381e0f0372f10f88a847087aa91a972770c4b
Component: engine
2014-03-17 11:07:12 -07:00
7ce9dbfd0a
Merge pull request #4700 from erikh/2371-sort_ports
...
In `docker ps`, sort by port instead of unsorted.
Upstream-commit: a9ac35cbfb90393f367270c265b5810f82afc3a5
Component: engine
2014-03-17 11:03:06 -07:00
105b130eaa
Merge pull request #4686 from pnasrat/benchmark-typo
...
Fix spelling of benchmark test
Upstream-commit: f68dd44dfa7098c23486c4d50b65318e7011fca3
Component: engine
2014-03-17 10:59:43 -07:00
c381c0f9d5
fix content-type detection in docker cp
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 90b283c39a36f34ac97f9eb0d66da3a0a9992caa
Component: engine
2014-03-17 17:56:21 +00:00
2e43a87446
Merge pull request #4672 from vieux/update_godoc_mflags
...
update godoc and add MAINTAINERS for mflags
Upstream-commit: 555c1ef670c7f0dd9e1bd195ac6391e06e657f67
Component: engine
2014-03-17 19:30:58 +02:00
b60da9d539
Fix docker cp trying to untar files that do not exist.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <erik@hollensbe.org > (github: erikh)
Upstream-commit: 9e69a042c50a3706c847addd68469dfe3eb698a0
Component: engine
2014-03-16 17:48:46 +00:00
a638dc66f8
In docker ps, sort by port instead of unsorted.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <erik@hollensbe.org > (github: erikh)
Upstream-commit: e32965dbb13973f61ba1c0496c8136cc8c9273a2
Component: engine
2014-03-16 16:28:44 +00:00
cb5ab8e061
Fix external link on security of containers
...
Docker-DCO-1.1-Signed-off-by: Vladimir Rutsky <altsysrq@gmail.com > (github: rutsky)
Upstream-commit: 65051f4215e493928a211c411f775ee1cc7a763f
Component: engine
2014-03-16 18:36:15 +04:00
8e25e532b5
Update nodejs_web_app.rst
...
the address of epel rpm has change to http://dl.fedoraproject ....
Upstream-commit: 853c5e258fc9a3d8420e62aaed4817179073610a
Component: engine
2014-03-16 01:07:22 +08:00
32c417d5a0
Fix spelling of benchmark test
...
Docker-DCO-1.1-Signed-off-by: Paul Nasrat <pnasrat@gmail.com > (github: pnasrat)
Upstream-commit: 5583774e29911bbd42181e8db2ece08761677cf3
Component: engine
2014-03-15 11:38:31 -04:00
3ace596568
Merge pull request #4676 from crosbymichael/no-sig-kill
...
Send sigterm to child instead of sigkill
Upstream-commit: f9090567af360c37b5d3f3811834a8de3ac0e06d
Component: engine
2014-03-14 16:44:08 -07:00
76b94861e7
Add Sam's Go "dockerclient" to the list of Client Libraries
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 2ba0861ad359477ad81346a81f1bac09cb5e2eb2
Component: engine
2014-03-14 17:20:22 -06:00
de094b3b6d
Merge pull request #4673 from vieux/update_test_TestCreateRmRunning
...
update TestCreateRmRunning
Upstream-commit: 75738b8527f7578f8a18696bc6b49961790414cd
Component: engine
2014-03-14 15:50:27 -07:00
6e363c4ca9
Merge pull request #4679 from metalivedev/updateimages
...
Update images to remove references to AUFS, LXC
Upstream-commit: 5fd2de979290e5a9261b67ffa4d9a895a40563fe
Component: engine
2014-03-15 08:45:37 +10:00
842270ca38
Send sigterm to child instead of sigkill
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 39037a91f85a4a072e5aa7e585d8c2f6b211df8a
Component: engine
2014-03-14 15:42:05 -07:00
567bf7e304
Add parent reference arrow.
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
Upstream-commit: 8c2cbfa0963e953cf75fe09ec688a6125689cc6d
Component: engine
2014-03-14 14:48:13 -07:00
636cbb42ab
Updating base svg to remove references to aufs and lxc.
...
Exported new png's from layers.
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
Upstream-commit: 50b12708e35c300d93e8f8e8d21f79101fc185d3
Component: engine
2014-03-14 14:37:09 -07:00
6da37c5cc7
Merge pull request #4647 from vieux/fix_registry_tests
...
use mock for search
Upstream-commit: 6a058540fe0872b96180c3e302f33435ddae5f36
Component: engine
2014-03-14 14:34:44 -07:00
294ad1e10b
update TestCreateRmRunning
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 123ebf905367f1da0d9480153d08912d58b721fc
Component: engine
2014-03-14 18:16:14 +00:00
2fa4f2c621
update godoc and add MAINTAINERS for mflags
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: a41f6d936754f66d1786fa5b840278443da8d93c
Component: engine
2014-03-14 17:35:41 +00:00
0d0170bb11
Add stderr log ouput if in debug
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 0e863a584a6edfa1c3ec383c586b646663b66bc7
Component: engine
2014-03-14 09:55:05 -07:00
3f944b4fd6
Add initial logging to libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 7294392c729de4c5884eb967f192b34a1d8857a7
Component: engine
2014-03-14 09:55:05 -07:00
e71ba07505
Update integration tests for server pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 8cf0b80a7843633018b66a35d9a55f30814a56b6
Component: engine
2014-03-14 09:46:56 -07:00
d7147519fc
Move server and buildfile into server pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 5239aa1f11c32f3befc25fb2fa8a0ecf75ec4bf6
Component: engine
2014-03-14 09:37:08 -07:00
a7c2cbac56
Merge pull request #4660 from vieux/parsecommand
...
create the cli obj before calling parseCommand
Upstream-commit: 5c6d54073f045d70c961245aee26455deac86177
Component: engine
2014-03-14 17:36:40 +02:00
19c6fcaf73
Merge pull request #4653 from creack/fix_expose_cache
...
Fix expose cache
Upstream-commit: 28a9ff7f2557d88174b46482a5b402c511684cf7
Component: engine
2014-03-14 16:09:13 +02:00
ef717aa91c
Make sphinx warnings fatal in Travis
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: ae47f709ca6a6c29b769191ceabb10e59a0408b1
Component: engine
2014-03-13 22:35:31 -06:00
b7e9a63083
Fix sphinx header underline warnings I introduced...
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: f6efcf20943e656ca977f1fd0ae5197f5757dff4
Component: engine
2014-03-13 22:35:09 -06:00
5a2ca94673
create the cli obj before calling parseCommand
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: c349c9d14a1c4bf04f35f3f5c62b0bb92614bc81
Component: engine
2014-03-14 00:47:13 +00:00
0795e31f12
Merge pull request #4659 from creack/more_info
...
Have the exec driver and kernel version in non-debug mode in `docker info`
Upstream-commit: 9c21a73f7449e412e101ba688459a26137f2c50d
Component: engine
2014-03-13 17:32:42 -07:00
b61f94b205
Merge pull request #4633 from crosbymichael/no-pid-kill
...
Don't kill by pid for other drivers
Upstream-commit: 400ae98d23f0fb70555b73f0dffa651f185999b4
Component: engine
2014-03-13 17:31:37 -07:00
5c034565db
Add unit test for expose cache
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: 7b89af2a08b65fac064603cb3b5eb8e091e2c076
Component: engine
2014-03-13 17:06:17 -07:00
4eb4057922
Have the exec driver and kernel version in non-debug mode in docker info
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: 6411ee6d24d256e15909ea68b845b354dc51c4ed
Component: engine
2014-03-13 16:28:16 -07:00
fa769864c8
Merge pull request #4658 from vieux/fix_display_build
...
fix build output
Upstream-commit: c0cef47b1e77c5527df3dd7abc7d3c51416befb5
Component: engine
2014-03-13 15:34:17 -07:00
1962352375
Merge pull request #4646 from tianon/double-dash
...
Update to double-dash everywhere
Upstream-commit: 212a870734b5be597579e59bfb8758c3b3198144
Component: engine
2014-03-13 15:31:14 -07:00
abbecb8a25
as you could have multiple messages per line with streams, don't \r
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 03f0ec35ae31420dd6a56883535056087b1a75dd
Component: engine
2014-03-13 22:26:42 +00:00
0e6df3669c
Update libcontainer readme and todo list
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: cbd2a30cd6185d1469f82f8b6693d6158c93d54a
Component: engine
2014-03-13 15:18:08 -07:00
0fda3b88ac
Don't kill by pid for other drivers
...
Closes #4575
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 3fa99b35b05d9159d6f7f4c7465dec747da2c4e1
Component: engine
2014-03-13 15:04:23 -07:00
1080c0f16b
Merge pull request #4656 from crosbymichael/fix-ptmx-link
...
Always symlink /dev/ptmx for libcontainer
Upstream-commit: 28994f86eef11074f613433893ef345321afef91
Component: engine
2014-03-13 14:57:17 -07:00
