clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-03 23:38:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,218 Commits 9 Branches 112 Tags
47e9f90be13d901c8fd6dfd0d77ec3f5debecada
Commit Graph
13218 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Morozov 4aa60a902a Merge pull request #10250 from crosbymichael/stats-test 
Improve robustness of /stats api test
 2015-01-22 09:09:03 -08:00
Ian Babrou 4d10b32380 Not doing extra assertion for io.Closer 
Signed-off-by: Ian Babrou <ibobrik@gmail.com>
 2015-01-22 10:36:20 +03:00
Abin Shahab 9c744cb454 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)
 2015-01-22 07:06:46 +00:00
Andrew C. Bodine 51060ee07a Adds docs for /containers/(id)/attach/ws api endpoint 
Signed-off-by: Andrew C. Bodine <acbodine@us.ibm.com>
 2015-01-21 18:37:08 -08:00
Andrew C. Bodine 9e37a04665 Adds test for api attach via websocket 
Signed-off-by: Andrew C. Bodine <acbodine@us.ibm.com>
 2015-01-21 18:35:51 -08:00
Jessica Frazelle c97d8b1233 Change the wording of image verification warning. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2015-01-21 18:07:10 -08:00
Michael Crosby 3c77e7d634 Merge pull request #10257 from vieux/lol 
bump API version
 2015-01-21 17:51:27 -08:00
Victor Vieux 9c7689a10e bump API version 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-01-22 01:15:34 +00:00
Andrew C. Bodine d25a65375c Closes #9311 Handles container id/name collisions against daemon functionalities according to #8069 
Signed-off-by: Andrew C. Bodine <acbodine@us.ibm.com>
 2015-01-21 17:11:31 -08:00
Jessie Frazelle fcc4abc870 Merge pull request #10225 from vbatts/vbatts-init_mount_namespaces 
daemon mount namespaces
 2015-01-21 16:55:15 -08:00
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
Arnaud Porterie 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
Jessica Frazelle 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
Jessica Frazelle 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
Jessie Frazelle 0f5eba68fb Merge pull request #10251 from crosbymichael/stats-zero 
Zero out stats values in the cli
 2015-01-21 16:16:55 -08:00
Michael Crosby 4d7707e183 Improve robustness of /stats api test 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-01-21 16:00:15 -08:00
Michael Crosby 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
Stephen J Day 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
Derek McGowan 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
Jessie Frazelle f1bc0376b8 Merge pull request #10254 from LK4D4/fix_etchosts_rewriting 
Fix etchosts rewriting
 2015-01-21 15:08:45 -08:00
Josh Hawn 58c142bcfa 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)
 2015-01-21 15:08:32 -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
Harald Albers 4bb113f24e 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>
 2015-01-21 09:15:30 +01: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
Abin Shahab 3ca5af6b1a 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)
 2015-01-21 06:08:00 +00: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