d18e557951
Merge pull request #10250 from crosbymichael/stats-test
...
Improve robustness of /stats api test
Upstream-commit: 4aa60a902a03294d8009747f3fc1ba26bb2fd27e
Component: engine
2015-01-22 09:09:03 -08:00
ce792ad046
Not doing extra assertion for io.Closer
...
Signed-off-by: Ian Babrou <ibobrik@gmail.com >
Upstream-commit: 4d10b32380793ce5e324a429ce2db60125aae205
Component: engine
2015-01-22 10:36:20 +03:00
ac1fc1f916
Fixes apparmor regression
...
Signed-off-by: Abin Shahab <ashahab@altiscale.com > (github: ashahab-altiscale)
Docker-DCO-1.1-Signed-off-by: Abin Shahab <ashahab@altiscale.com > (github: ashahab-altiscale)
Upstream-commit: 9c744cb454f7d912ae1dd6215caf550a25929944
Component: engine
2015-01-22 07:06:46 +00:00
5c5aa72c84
Adds docs for /containers/(id)/attach/ws api endpoint
...
Signed-off-by: Andrew C. Bodine <acbodine@us.ibm.com >
Upstream-commit: 51060ee07aaf3ff10ac7187558bd665f4ddd3507
Component: engine
2015-01-21 18:37:08 -08:00
24e8380b6a
Adds test for api attach via websocket
...
Signed-off-by: Andrew C. Bodine <acbodine@us.ibm.com >
Upstream-commit: 9e37a04665395cb98687cd09b05ba33736984547
Component: engine
2015-01-21 18:35:51 -08:00
72b2fe27b4
Change the wording of image verification warning.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: c97d8b1233bc17a9e58ce97473329ab5de59969a
Component: engine
2015-01-21 18:07:10 -08:00
fd76e3bccd
bump API version
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 9c7689a10e60cd921e1521c729c07184b7c1076c
Component: engine
2015-01-22 01:15:34 +00:00
685b876322
Closes #9311 Handles container id/name collisions against daemon functionalities according to #8069
...
Signed-off-by: Andrew C. Bodine <acbodine@us.ibm.com >
Upstream-commit: d25a65375c880017ac0c516389b0b7afde810517
Component: engine
2015-01-21 17:11:31 -08:00
331f9fe663
Merge pull request #10225 from vbatts/vbatts-init_mount_namespaces
...
daemon mount namespaces
Upstream-commit: fcc4abc870e7f62590e418f10ff6f743a47fad12
Component: engine
2015-01-21 16:55:15 -08:00
0d4aa9a72d
Add key migration to daemon
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 007ef161b45dd91afcfb7ef9cd32e6c88dbf196e
Component: engine
2015-01-21 16:55:05 -08:00
c5219e9048
Fix daemon key file location
...
Fixes #10233
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 06af013f8bdf5c9af85c4b3f158292d79ab644a5
Component: engine
2015-01-21 16:28:19 -08:00
ee34de2e39
Merge pull request #10235 from jfrazelle/tech-preview-warning
...
Warn about tech preview of image verification.
Upstream-commit: e13559a6d69b8c192ba2e0605f956ae84d1eb0db
Component: engine
2015-01-21 16:24:00 -08:00
f6fc27f6b6
Add test for pull verified
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 614e09a8c7990e05509edb4c335c4b59001cea61
Component: engine
2015-01-21 16:25:01 -08:00
366e7721bb
Warn about tech preview of checksums.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 1820003078eeae6ab25e2440669c490caff59b57
Component: engine
2015-01-21 16:25:01 -08:00
13d7d6cab3
Merge pull request #10251 from crosbymichael/stats-zero
...
Zero out stats values in the cli
Upstream-commit: 0f5eba68fbe4904090532a709e7f3769059bc0aa
Component: engine
2015-01-21 16:16:55 -08:00
9381b90c95
Improve robustness of /stats api test
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 4d7707e183e8dcb8e0ab1415e401cb530df17c92
Component: engine
2015-01-21 16:00:15 -08:00
7304bd6808
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 >
Upstream-commit: bbc38497b6f522b0a9c4e5e976abfd79692b8b5f
Component: engine
2015-01-21 15:33:53 -08:00
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
f38ca916fb
Split API Version header when checking for v2
...
Since the Docker-Distribution-API-Version header value may contain multiple
space delimited versions as well as many instances of the header key, the
header value is now split on whitespace characters to iterate over all versions
that may be listed in one instance of the header.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: 58c142bcfa2b9edce7efe72d393e9f90b9df9927
Component: engine
2015-01-21 15:08:32 -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
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
50eae15c89
Add bash completions for daemon flags, simplify with extglob
...
Implementing the deamon flags the traditional way introduced even more
redundancy than usual because the same list of options with flags
had to be added twice.
This can be avoided by using variables in the case statements when
using the extglob shell option.
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 4bb113f24e1ea12ab7ab9ddfe0508e4f833445e5
Component: engine
2015-01-21 09:15:30 +01:00
3d77110890
Adds ipc namespace capability to lxc, and fixes tests.
...
This fixes various tests by checking for non zero exit code, accounting for lxc-specific base-diffs, and by removing lxc specific environment vars.
It also adds the --share-ipc option to lxc-start for shared ipc namespaces.
Signed-off-by: Abin Shahab <ashahab@altiscale.com > (github: ashahab-altiscale)
Docker-DCO-1.1-Signed-off-by: Abin Shahab <ashahab@altiscale.com > (github: ashahab-altiscale)
Upstream-commit: 3ca5af6b1ab6d1b75e014265e1ad4f5e45960826
Component: engine
2015-01-21 06:08:00 +00: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
