Derek McGowan
007ef161b4
Add key migration to daemon
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-01-21 16:55:05 -08:00
Derek McGowan
06af013f8b
Fix daemon key file location
...
Fixes #10233
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-01-21 16:28:19 -08:00
Jessie Frazelle
f1bc0376b8
Merge pull request #10254 from LK4D4/fix_etchosts_rewriting
...
Fix etchosts rewriting
2015-01-21 15:08:45 -08:00
Alexander Morozov
606c71d424
Test for updating linked hosts on restart
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-01-21 14:34:40 -08:00
Alexander Morozov
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
Michael Crosby
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
Michael Crosby
b8fe989b9b
Merge pull request #10187 from jfrazelle/update-skip-graphtest
...
update graphtest
2015-01-21 14:09:16 -08:00
Michael Crosby
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
Jessie Frazelle
649ad2d56e
Merge pull request #10246 from crosbymichael/stats-edits
...
Update to docker stats documentation post review
2015-01-21 13:14:22 -08:00
Michael Crosby
db9b1e3654
Update to docker stats documentation
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-01-21 11:44:23 -08:00
Brian Goff
811b138f7e
Fix call to nil stat
...
Fixes #10242
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-01-21 14:25:35 -05:00
Jessie Frazelle
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
Alexander Morozov
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
Alexander Morozov
f72bcd3362
Merge pull request #10200 from cpuguy83/fix_racey_TestAttachAfterDetach
...
Fix racey TestAttachAfterDetach
2015-01-21 09:20:24 -08:00
Arnaud Porterie
d8a1cbe8d2
Merge pull request #9984 from crosbymichael/metrics
...
Docker stats live container resource metrics
2015-01-21 09:17:51 -08:00
Michael Crosby
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
Brian Goff
6ef8057700
Fix racey TestAttachAfterDetach
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-01-21 10:08:37 -05:00
Tibor Vass
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
Michael Crosby
217a2bd1b6
Remove publisher if no one is listening
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-01-20 20:21:47 -08:00
Michael Crosby
76141a0077
Add documentation for stats feature
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-01-20 20:21:47 -08:00
Michael Crosby
2f46b7601a
Add pubsub package to handle robust publisher
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-01-20 20:21:46 -08:00
Michael Crosby
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
Alexander Morozov
cc658804c0
Refactor cli for stats
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-01-20 20:21:46 -08:00
Michael Crosby
4f174aa792
Evict stopped containers
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-01-20 20:21:46 -08:00
Michael Crosby
2640a10bca
Implement client side display for stats
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-01-20 20:21:46 -08:00
Michael Crosby
65f58e2a74
Implement container stats collection in daemon
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-01-20 20:21:46 -08:00
Tianon Gravi
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
Josh Hawn
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
Phil Estes
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
Michael Crosby
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
Michael Crosby
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
Fred Lifton
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
Vincent Batts
9b2afa04f8
Merge pull request #10222 from vbatts/vbatts-dm_flag_and_output
...
dm flag and output
2015-01-20 18:45:43 -05:00
Michael Crosby
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
James Turnbull
a276706719
Merge pull request #10206 from jfrazelle/add-docs-memory-swap
...
Add docs for `--memory-swap`.
2015-01-20 18:20:13 -05:00
Brian Goff
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
9305020d9f
Merge pull request #10223 from tianon/go1.3-TestBuildWithTabs
...
Update TestBuildWithTabs to allow for the "\t"-equivalent "\u0009" (for Go 1.3 support)
2015-01-20 11:37:43 -08:00
Vincent Batts
092d52281d
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
2015-01-20 14:15:41 -05:00
Tianon Gravi
142369456d
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>
2015-01-20 12:11:59 -07:00
Vincent Batts
fa7af79885
Merge pull request #10193 from vbatts/vbatts-dm_logging
...
devmapper: initialize log levels
2015-01-20 14:06:01 -05:00
Daniel, Dao Quang Minh
9462dbb242
test that execin cgroups match container cgroups
...
Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com>
2015-01-20 13:51:15 -05:00
Vincent Batts
0c8be9da37
devmapper: initialize log levels
...
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2015-01-20 13:31:19 -05:00
Vincent Batts
a687e8d86b
devicemapper: define device-mapper log levels
...
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2015-01-20 13:31:12 -05:00
Alexander Morozov
e9d3e237e5
Merge pull request #10005 from estesp/fix-localhost-nameserver-cleanup
...
Clean up localhost resolv logic and add IPv6 support to regexp
2015-01-20 10:30:06 -08:00
Alexander Morozov
b2fe1b3dd9
Merge pull request #10155 from tianon/netgo-take-three
...
Let's try fixing "netgo" again
2015-01-20 09:45:42 -08:00
Vincent Batts
06da161aee
Merge pull request #10204 from vbatts/vbatts-dm_info_docs
...
devmapper: some explination of `docker info`
2015-01-20 09:41:25 -05:00
Tianon Gravi
2feb2d07b6
Merge pull request #10189 from crosbymichael/update-libcontainer-jan16
...
Update to libcontainer eb74393a3d2daeafbef4f5f27c0
2015-01-19 19:33:40 -07:00
Fred Lifton
e6a70a6f81
Merge pull request #10135 from coolljt0725/update_link_docs
...
Update the docs for --link accept container id
2015-01-19 18:12:50 -08:00
Michael Crosby
7b48488c56
Merge pull request #10190 from ashahab-altiscale/9875-lxc-run-links
...
LXC needs stdin for container to remain up
2015-01-19 17:13:37 -08:00
Michael Crosby
1efc940e6f
Merge pull request #10124 from duglin/Issue10034
...
Add the list of possible values for --log-level to help text
2015-01-19 17:09:18 -08:00