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
74ee9041ea
Merge pull request #10246 from crosbymichael/stats-edits
...
Update to docker stats documentation post review
Upstream-commit: 649ad2d56e303013e43ef374083d97556eb94499
Component: engine
2015-01-21 13:14:22 -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
fdaa4278ca
Merge pull request #10200 from cpuguy83/fix_racey_TestAttachAfterDetach
...
Fix racey TestAttachAfterDetach
Upstream-commit: f72bcd336241ea5edbf25df6e3476d6afbd1b01d
Component: engine
2015-01-21 09:20:24 -08:00
dfc1d17a7c
Merge pull request #9984 from crosbymichael/metrics
...
Docker stats live container resource metrics
Upstream-commit: d8a1cbe8d295660a479d53cf29ce9491ccbbc4f2
Component: engine
2015-01-21 09:17:51 -08:00
6bc1b160e8
Exit cli when all containers when no more containers to monitor
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 4b173199fde99a2b275421ed070b0ec004730e35
Component: engine
2015-01-21 08:55:23 -08:00
d8af8d0b9f
Fix racey TestAttachAfterDetach
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 6ef8057700b63e2c5fd5cec206915ef1f2088578
Component: engine
2015-01-21 10:08:37 -05:00
dc648984ac
Merge pull request #10227 from jlhawn/v1_v2_login_patch
...
Resolve ambiguity on registry v2 ping
Upstream-commit: 9de604ad68033d08721ce61db7300cee338837e2
Component: engine
2015-01-21 02:10:32 -05:00
b793c28c03
Remove publisher if no one is listening
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 217a2bd1b62788e53fd38810b30672db58a4efc5
Component: engine
2015-01-20 20:21:47 -08:00
a77fb96f4c
Add documentation for stats feature
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 76141a00779880368b15ef2a5ffd28a80e4637df
Component: engine
2015-01-20 20:21:47 -08:00
045cd9fe99
Add pubsub package to handle robust publisher
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 2f46b7601a3f5e11359b79624d73075b69778fbb
Component: engine
2015-01-20 20:21:46 -08:00
debfc19162
Refactor usage calc for CPU and system usage
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 2d4fc1de0560c8052b4480035bb364fb28525b39
Component: engine
2015-01-20 20:21:46 -08:00
5cb454e8c2
Refactor cli for stats
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: cc658804c000b8f652750ccf3233a73cc6f03073
Component: engine
2015-01-20 20:21:46 -08:00
2dcbad59cf
Evict stopped containers
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 4f174aa79276c12a1b2b98df2f02d6bee36b7a93
Component: engine
2015-01-20 20:21:46 -08:00
03d1b8dbe7
Implement client side display for stats
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 2640a10bca29c4a4199c906a26f658aac8a68dc2
Component: engine
2015-01-20 20:21:46 -08:00
947efff180
Implement container stats collection in daemon
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 65f58e2a742205c9e8470b360bd439642a5c8211
Component: engine
2015-01-20 20:21:46 -08:00
7d2e2990e3
Update Dockerfile to use Godeps for distribution
...
Update our "registry" install to use the included Godeps libraries so that it
doesn't require anything from our current source (hence moving it up for
better caching too)
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 681f4d84ae05a98b7096d52a168222bae362d9e1
Component: engine
2015-01-20 19:52:08 -08:00
a90195f1c8
Resolve ambiguity on registry v2 ping
...
v2 ping now checks for a Docker-Distribution-API-Version
header that identifies the endpoint as "registry/2.0"
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: f46923be8eba81dd9e261554128b26a1c83ce398
Component: engine
2015-01-20 19:52:08 -08:00
42697702c5
Move iptables check out of runtime init() to separate function
...
Due to the iptables package being `init`ed at start of the docker
runtime, this means the iptables --wait command listing all rules
is run, no matter if the command is simply "docker -h". It makes
more sense to both locate the iptables command and check for the
wait flag support at the time iptables is actually used, as it
may not be used at all if certain network support is off/configured
differently.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 5e8285b08120f674b12a34c3f146216f6854a173
Component: engine
2015-01-20 21:04:22 -05:00
ff8b2a1301
Merge pull request #10122 from dqminh/execin-wait-cgroup
...
ExecIn process should wait for the parent signal before forking
Upstream-commit: 5f5e02d22c2bd9793e35eb982592c37a65f37674
Component: engine
2015-01-20 18:02:14 -08:00
f182adf280
Merge pull request #10205 from ashahab-altiscale/9875-non-privileged-proc-sys
...
use lxc.auto.mount to ensure proc and sys are readonly
Upstream-commit: cac17f990bcdad8ef1f69da29e73f41df84b8caa
Component: engine
2015-01-20 17:54:56 -08:00
f39e23250f
Merge pull request #10173 from SvenDowideit/release-1.5-combined-documentation
...
An initial quick import of documentation from Compose, Machine and Swarm
Upstream-commit: 620b58068f7c4e381254ad4c17cc4c7e0ca63a9b
Component: engine
2015-01-20 17:08:55 -08:00
f11f701e04
Merge pull request #10222 from vbatts/vbatts-dm_flag_and_output
...
dm flag and output
Upstream-commit: 9b2afa04f8ab491d56614835de09eb0880250309
Component: engine
2015-01-20 18:45:43 -05:00
8848880ea1
Merge pull request #10147 from cpuguy83/9629_volumes-from_unregistered-container
...
fix Bind-mounts not properly registering after daemon restart
Upstream-commit: cc66fa35431330a232400fdab1e374ffc87c61f2
Component: engine
2015-01-20 15:37:55 -08:00
1c8677b886
Merge pull request #10206 from jfrazelle/add-docs-memory-swap
...
Add docs for `--memory-swap`.
Upstream-commit: a276706719a9c2d437c643281639ffa80daf1fdd
Component: engine
2015-01-20 18:20:13 -05:00
d625d83871
Fix volume ref restore process
...
Fixes #9629 #9768
A couple of issues:
1) Volume config is not restored if we couldn't find it with the graph
driver, but bind-mounts would never be found by the graph driver since
they aren't in that dir
2) container volumes were only being restored if they were found in the
volumes repo, but volumes created by old daemons wouldn't be in the
repo until the container is at least started.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: e744b0dcbacd5e226fd79aba5a2e83f432d2d13f
Component: engine
2015-01-20 15:54:56 -05:00
a150249a50
Merge pull request #10223 from tianon/go1.3-TestBuildWithTabs
...
Update TestBuildWithTabs to allow for the "\t"-equivalent "\u0009" (for Go 1.3 support)
Upstream-commit: 9305020d9f5471c15666cf7203dd1c0734987c72
Component: engine
2015-01-20 11:37:43 -08:00
31756f48b3
Merge pull request #9970 from shishir-a412ed/docker_load_issue
...
Implementation of docker load command, load the tar ball directly into /var/lib/docker/graph
Upstream-commit: 092d52281d20e3456677ac11d781abf1cd0bdd8f
Component: engine
2015-01-20 14:15:41 -05:00
c34a3e1187
Update TestBuildWithTabs to allow for the "\t"-equivalent "\u0009" (for Go 1.3 support)
...
This is literally the only failing test on Go 1.3.3: 🎉
```
--- FAIL: TestBuildWithTabs (0.43 seconds)
docker_cli_build_test.go:4307: Missing tabs.
Got:["/bin/sh","-c","echo\u0009one\u0009\u0009two"]
Exp:["/bin/sh","-c","echo\tone\t\ttwo"]
```
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 142369456d2469a06e3860bdfe13169a908a3707
Component: engine
2015-01-20 12:11:59 -07:00
ca9b7e2a12
Merge pull request #10193 from vbatts/vbatts-dm_logging
...
devmapper: initialize log levels
Upstream-commit: fa7af79885f43bdbd0d13b6c8e1bdbab7b2cc722
Component: engine
2015-01-20 14:06:01 -05:00
8d334a8cc4
test that execin cgroups match container cgroups
...
Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com >
Upstream-commit: 9462dbb242449b126ff473d081cec04afaa936d2
Component: engine
2015-01-20 13:51:15 -05:00
85aed8db6e
devmapper: initialize log levels
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 0c8be9da3763d86c2a6e847e1667410056d6071d
Component: engine
2015-01-20 13:31:19 -05:00
3757727dfa
devicemapper: define device-mapper log levels
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: a687e8d86ba07ebb42d988b6e13102569b60e673
Component: engine
2015-01-20 13:31:12 -05:00
dbf7d610b8
Merge pull request #10005 from estesp/fix-localhost-nameserver-cleanup
...
Clean up localhost resolv logic and add IPv6 support to regexp
Upstream-commit: e9d3e237e5cffef0dfcd4949c31959cd25863f3f
Component: engine
2015-01-20 10:30:06 -08:00
243df800ea
Merge pull request #10155 from tianon/netgo-take-three
...
Let's try fixing "netgo" again
Upstream-commit: b2fe1b3dd952daaadccf9951c269af84030e8873
Component: engine
2015-01-20 09:45:42 -08:00
ea711cace6
Merge pull request #10204 from vbatts/vbatts-dm_info_docs
...
devmapper: some explination of `docker info`
Upstream-commit: 06da161aeeb6b458cac2db44db6e3af59d091402
Component: engine
2015-01-20 09:41:25 -05:00
cad4508ee5
Merge pull request #10189 from crosbymichael/update-libcontainer-jan16
...
Update to libcontainer eb74393a3d2daeafbef4f5f27c0
Upstream-commit: 2feb2d07b6f98364a585d82af250d32664fd8df3
Component: engine
2015-01-19 19:33:40 -07:00
304cd59f67
Merge pull request #10135 from coolljt0725/update_link_docs
...
Update the docs for --link accept container id
Upstream-commit: e6a70a6f819c09f2d33b59adc7378f758349ae6d
Component: engine
2015-01-19 18:12:50 -08:00
73a96089ff
Merge pull request #10190 from ashahab-altiscale/9875-lxc-run-links
...
LXC needs stdin for container to remain up
Upstream-commit: 7b48488c5641f092e111aa9d5562b368f7e66711
Component: engine
2015-01-19 17:13:37 -08:00
f4d05bcf4d
Merge pull request #10124 from duglin/Issue10034
...
Add the list of possible values for --log-level to help text
Upstream-commit: 1efc940e6f547760e5e8f4648acb120ff19fdc58
Component: engine
2015-01-19 17:09:18 -08:00
