clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-08-27 11:16:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,774 Commits 9 Branches 112 Tags
018ab080bb31370268708202ad85eaa5a217d011
Commit Graph

12774 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tianon Gravi 018ab080bb Remove windows from the list of supported platforms 
Since it can still be tested natively without this, this won't cause any harm while we fix the tests to actually work on Windows.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-01-27 19:35:24 -08:00
Tibor Vass fe94ecb2c1 integration-cli: wait for container before sending ^D 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2015-01-27 19:35:24 -08:00
Lorenz Leutgeb 7b2e67036f Fix inconsistent formatting 
Colon was bold, but regular at other occurences.

Blame cf27b310c4

Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
 2015-01-27 19:35:24 -08:00
Lorenz Leutgeb e130faea1b doc: Minor semantical/editorial fixes in HTTPS article 
"read-only" vs. "only readable by you"

Refer to:
https://github.com/docker/docker/pull/9952#discussion_r22690266

Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
 2015-01-27 19:35:24 -08:00
Lorenz Leutgeb 38f09de334 doc: Editorial changes as suggested by @fredlf 
Refer to:
 * https://github.com/docker/docker/pull/9952#discussion_r22686652
 * https://github.com/docker/docker/pull/9952#discussion_r22686804

Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
 2015-01-27 19:35:24 -08:00
Lorenz Leutgeb f9ba68ddfb doc: Improve article on HTTPS 
* Adjust header to match _page_title
 * Add instructions on deletion of CSRs and setting permissions
 * Simplify some path expressions and commands
 * Consqeuently use ~ instead of ${HOME}
 * Precise formulation ('key' vs. 'public key')
 * Fix wrong indentation of output of `openssl req`
 * Use dash ('--') instead of minus ('-')

Remark on permissions:

It's not a problem to `chmod 0400` the private keys, because the
Docker daemon runs as root (can read the file anyway) and the Docker
client runs as user.

Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
 2015-01-27 19:35:23 -08:00
Abin Shahab 16913455bd 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-27 19:35:23 -08:00
Andrew C. Bodine 32f189cd08 Adds docs for /containers/(id)/attach/ws api endpoint 
Signed-off-by: Andrew C. Bodine <acbodine@us.ibm.com>
 2015-01-27 19:35:23 -08:00
Josh Hawn 526ca42282 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-27 19:35:23 -08:00
Harald Albers b98b42d843 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-27 19:35:23 -08:00
imre Fitos 7bf03dd132 fix typo 'setup/set up' 
Signed-off-by: imre Fitos <imre.fitos+github@gmail.com>
 2015-01-27 19:35:23 -08:00
imre Fitos 034aa3b2c4 start docker before checking for updated NAT rule 
Signed-off-by: imre Fitos <imre.fitos+github@gmail.com>
 2015-01-27 19:35:23 -08:00
imre Fitos 6da1e01e6c docs: remove NAT rule when removing bridge 
Signed-off-by: imre Fitos <imre.fitos+github@gmail.com>
 2015-01-27 19:35:23 -08:00
Arnaud Porterie 5a6f84ce08 Merge pull request #10282 from tiborvass/fix-test-restart-policy-always 
integration-cli: Fix race in restart loop
 2015-01-22 13:17:23 -08:00
Arnaud Porterie 10ab6dcb4f Merge pull request #10234 from dmcgowan/libtrust-key-fix 
Fix daemon key file location
 2015-01-22 11:54:03 -08:00
Derek McGowan d55e977cf5 Fix nits and defers 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-01-22 11:22:31 -08:00
Jessie Frazelle 211513156d Merge pull request #10259 from jfrazelle/wording-of-image-verification 
Change the wording of image verification warning.
 2015-01-22 11:14:28 -08:00
Tibor Vass 752a0d6f34 integration-cli: Fix race in restart loop 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2015-01-22 14:06:24 -05:00
Derek McGowan 42612ff6db Add key migration integration test 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-01-22 10:51:04 -08:00
Derek McGowan a34a7930b5 Add TODO lines for windows 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-01-22 10:29:15 -08:00
Jessie Frazelle 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
Arnaud Porterie 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
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
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
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
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