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
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
4aa60a902a
Merge pull request #10250 from crosbymichael/stats-test
...
Improve robustness of /stats api test
2015-01-22 09:09:03 -08:00
4d10b32380
Not doing extra assertion for io.Closer
...
Signed-off-by: Ian Babrou <ibobrik@gmail.com>
2015-01-22 10:36:20 +03:00
3c77e7d634
Merge pull request #10257 from vieux/lol
...
bump API version
2015-01-21 17:51:27 -08:00
9c7689a10e
bump API version
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-22 01:15:34 +00:00
fcc4abc870
Merge pull request #10225 from vbatts/vbatts-init_mount_namespaces
...
daemon mount namespaces
2015-01-21 16:55:15 -08:00
e13559a6d6
Merge pull request #10235 from jfrazelle/tech-preview-warning
...
Warn about tech preview of image verification.
2015-01-21 16:24:00 -08:00
614e09a8c7
Add test for pull verified
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2015-01-21 16:25:01 -08:00
1820003078
Warn about tech preview of checksums.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2015-01-21 16:25:01 -08:00
0f5eba68fb
Merge pull request #10251 from crosbymichael/stats-zero
...
Zero out stats values in the cli
2015-01-21 16:16:55 -08:00
4d7707e183
Improve robustness of /stats api test
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-01-21 16:00:15 -08:00
bbc38497b6
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>
2015-01-21 15:33:53 -08:00
4e4a5b2532
Ensure that progress reader is closed after usage
...
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-01-21 15:14:01 -08:00
12d83e727d
Fix write after close on http response
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-01-21 15:14:01 -08:00
f1bc0376b8
Merge pull request #10254 from LK4D4/fix_etchosts_rewriting
...
Fix etchosts rewriting
2015-01-21 15:08:45 -08:00
606c71d424
Test for updating linked hosts on restart
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-01-21 14:34:40 -08:00
c2a25058e8
Update links aliases, not name on restart
...
Fixes #8721
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-01-21 14:34:27 -08:00
edaf23b7a7
Merge pull request #10145 from duglin/Issue10141
...
Docker run -e FOO should erase FOO if FOO isn't set in client env
2015-01-21 14:16:51 -08:00
b8fe989b9b
Merge pull request #10187 from jfrazelle/update-skip-graphtest
...
update graphtest
2015-01-21 14:09:16 -08:00
12dd9af951
Merge pull request #10243 from cpuguy83/10242_fix_stat_on_err
...
Fix call to nil stat
2015-01-21 13:55:39 -08:00
649ad2d56e
Merge pull request #10246 from crosbymichael/stats-edits
...
Update to docker stats documentation post review
2015-01-21 13:14:22 -08:00
db9b1e3654
Update to docker stats documentation
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-01-21 11:44:23 -08:00
811b138f7e
Fix call to nil stat
...
Fixes #10242
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-01-21 14:25:35 -05:00
f3aed2a297
Merge pull request #10231 from estesp/move-iptables-check
...
Move iptables check out of runtime init() to separate function
2015-01-21 10:46:40 -08:00
fd6bd80909
Merge pull request #10196 from bobrik/unused-compression-arg
...
Removed unused compression arg in Graph.TempLayerArchive()
2015-01-21 09:27:32 -08:00
f72bcd3362
Merge pull request #10200 from cpuguy83/fix_racey_TestAttachAfterDetach
...
Fix racey TestAttachAfterDetach
2015-01-21 09:20:24 -08:00
d8a1cbe8d2
Merge pull request #9984 from crosbymichael/metrics
...
Docker stats live container resource metrics
2015-01-21 09:17:51 -08:00
4b173199fd
Exit cli when all containers when no more containers to monitor
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-01-21 08:55:23 -08:00
6ef8057700
Fix racey TestAttachAfterDetach
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-01-21 10:08:37 -05:00
9de604ad68
Merge pull request #10227 from jlhawn/v1_v2_login_patch
...
Resolve ambiguity on registry v2 ping
2015-01-21 02:10:32 -05:00
217a2bd1b6
Remove publisher if no one is listening
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-01-20 20:21:47 -08:00
76141a0077
Add documentation for stats feature
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-01-20 20:21:47 -08:00
2f46b7601a
Add pubsub package to handle robust publisher
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-01-20 20:21:46 -08:00
2d4fc1de05
Refactor usage calc for CPU and system usage
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-01-20 20:21:46 -08:00
cc658804c0
Refactor cli for stats
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-01-20 20:21:46 -08:00
4f174aa792
Evict stopped containers
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-01-20 20:21:46 -08:00
2640a10bca
Implement client side display for stats
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-01-20 20:21:46 -08:00
65f58e2a74
Implement container stats collection in daemon
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-01-20 20:21:46 -08:00
681f4d84ae
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>
2015-01-20 19:52:08 -08:00
f46923be8e
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)
2015-01-20 19:52:08 -08:00
5e8285b081
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)
2015-01-20 21:04:22 -05:00
5f5e02d22c
Merge pull request #10122 from dqminh/execin-wait-cgroup
...
ExecIn process should wait for the parent signal before forking
2015-01-20 18:02:14 -08:00
cac17f990b
Merge pull request #10205 from ashahab-altiscale/9875-non-privileged-proc-sys
...
use lxc.auto.mount to ensure proc and sys are readonly
2015-01-20 17:54:56 -08:00
620b58068f
Merge pull request #10173 from SvenDowideit/release-1.5-combined-documentation
...
An initial quick import of documentation from Compose, Machine and Swarm
2015-01-20 17:08:55 -08:00
9b2afa04f8
Merge pull request #10222 from vbatts/vbatts-dm_flag_and_output
...
dm flag and output
2015-01-20 18:45:43 -05:00
cc66fa3543
Merge pull request #10147 from cpuguy83/9629_volumes-from_unregistered-container
...
fix Bind-mounts not properly registering after daemon restart
2015-01-20 15:37:55 -08:00
a276706719
Merge pull request #10206 from jfrazelle/add-docs-memory-swap
...
Add docs for `--memory-swap`.
2015-01-20 18:20:13 -05:00
6bb6586458
contrib/sysvinit-redhat: unshare mount namespace
...
unshare the mount namespace of the docker daemon to avoid other pids
outside the daemon holding mount references of docker containers.
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2015-01-20 16:00:41 -05:00
e744b0dcba
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>
2015-01-20 15:54:56 -05:00
Jessie Frazelle