bf660d94fc
add time since exit in docker ps
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 15a267b57d2394dd5cb697f9a80b6df4fc939a76
Component: engine
2014-03-18 01:34:43 +00:00
3865d7d383
Merge pull request #4661 from vieux/add_no_prune
...
Add no prune
Upstream-commit: 68dc1896804de92b8c39cfc6bd4f7c96d4abe09e
Component: engine
2014-03-17 16:07:55 -07:00
0aaef1f844
Merge pull request #4710 from jimenez/4680-timeout_flag-fix
...
Disable timeout
Upstream-commit: fb503da34e2eae1aab3a54eed4c5a2374fa35c7d
Component: engine
2014-03-18 00:38:39 +02:00
c4297c670a
Merge pull request #4702 from timthelion/Issue#4681-1
...
Fix Issue#4681
Upstream-commit: 30541ade821392710edb5bbdd72bd1d1c246e04b
Component: engine
2014-03-17 15:31:54 -07:00
e839931238
adding configuration for timeout and disable it by default
...
Docker-DCO-1.1-Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com > (github: jimenez)
Upstream-commit: 25218f9b239784e6f38550a6e320bce56aaca3e1
Component: engine
2014-03-17 15:12:02 -07:00
ff82619b66
Refactor out interface specific information from execdriver.Network
...
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
Upstream-commit: 659b719aa66e7ed0c3104d3704fa61035050ad82
Component: engine
2014-03-17 22:53:48 +01:00
431a7612ca
Merge pull request #4689 from ralphbean/patch-1
...
Update fedora.rst
Upstream-commit: 865310e99daf93002b233cf7d4d5c2d1ac40c3ae
Component: engine
2014-03-18 07:49:48 +10:00
ccebbeffe2
Fix issue #4681 - No loopback interface within container when networking is disabled.
...
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
Remove loopback code from veth strategy
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
Looback strategy: Get rid of uneeded code in Create
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
Use append when building network strategy list
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
Swap loopback and veth strategies in Networks list
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
Revert "Swap loopback and veth strategies in Networks list"
This reverts commit 3b8b2c8454171d79bed5e9a80165172617e92fc7.
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
When initializing networks, only return from the loop if there is an error
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
Upstream-commit: 353df19ab7009f6555dee506841ae0b690a08768
Component: engine
2014-03-17 22:01:24 +01:00
73c73fe476
Add failing test case for issue #4681
...
Add a failing test case for an issue where docker is not creating a loopback device if networking is dissabled.
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
Upstream-commit: 53c5b1856d91093fed1c2d3f038d227f5fdef4b8
Component: engine
2014-03-17 22:01:24 +01:00
c6aab2eaa4
Merge pull request #4723 from vieux/fix_panic_monitor
...
fix panic in monitor
Upstream-commit: dd040c98706cd8ee3022061a63dc064b31fff890
Component: engine
2014-03-17 13:52:22 -07:00
ec6d6bab54
Merge pull request #4721 from vieux/4716-display_ps-fix
...
Fix display command display in docker ps
Upstream-commit: 0e92c7c24a64a4cc36b38ffb35f3e8498bcb1790
Component: engine
2014-03-17 22:04:00 +02:00
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
2f4b69fe2b
fix tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 326f6a4b4d942bf75ecb003e5c0d439bcb9d67cf
Component: engine
2014-03-17 19:17: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
d986adda7d
Add missing client doc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: a18d08177c1b11fd1e88c27d78a7256b5d498d64
Component: engine
2014-03-17 18:40:57 +00:00
5a4e6f4343
update doc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: afcaaffd0bb84d0c97f4a3ef54f4d35ba3942f65
Component: engine
2014-03-17 18:40:57 +00:00
c7bbb9caec
add no prune to rmi
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: edd8d2d3511b0b632149d1c1f2cfd2bad2df4679
Component: engine
2014-03-17 18:40:57 +00: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
cad533fcfe
display command display in docker ps
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 5921b186d17b172f205f3b0b6bda1f3a4e650d3f
Component: engine
2014-03-17 18:36:15 +00: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
29edaa65ac
Update fedora.rst
...
It looks like ``wmdocker`` does not have an update for Fedora 20:
```
~❯ pkgwat releases wmdocker
Starting new HTTPS connection (1): apps.fedoraproject.org
+---------------+----------------+-----------------+
| release | stable_version | testing_version |
+---------------+----------------+-----------------+
| Rawhide | 1.5-12.fc21 | None |
| Fedora 20 | None | None |
| Fedora 19 | None | None |
| Fedora EPEL 7 | None | None |
| Fedora EPEL 6 | None | None |
| Fedora EPEL 5 | None | None |
+---------------+----------------+-----------------+
```
I'm not sure if the owner awjb is intending to create an F20 update or
not, but either way -- these docs are incorrect as currently written.
Docker-DCO-1.1-Signed-off-by: Ralph Bean <rbean@redhat.com > (github: ralphbean)
Upstream-commit: a62c7215c6c4675a4f99b63871d89198b211c260
Component: engine
2014-03-17 14:18:11 -04: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
