clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-04 07:48:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,710 Commits 9 Branches 112 Tags
2c24a8a4ea7ea0571cd4e125158fa59f584d2464
Commit Graph
14710 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Irvine 1a4d2a5c8b Add some new graphics for installation and understanding docs 
Fixes: #11552

- scalable SVG
- uses colours from the rest of the page
- emphasizes that boot2docker is the ordinary Linux setup in a VM
- Add new graphic for architecture diagram
- Add windows boot2docker diagram
- Add windows diagram to documentation
- Remove old PNGs; replaced with SVGs
- Add redirects for new SVG versions of installation diagrams

Signed-off-by: Nick Irvine <nfirvine@nfirvine.com>
 2015-04-01 14:24:53 -07:00
Alexander Morozov 81f9b72c64 Bump API version and docs to v1.19 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-01 13:40:56 -07:00
Tibor Vass 4467b6a2cb Merge pull request #11974 from crosbymichael/registry-jobs 
Remove jobs from registry.Service
 2015-04-01 16:32:41 -04:00
Simon Leinen b58c4b8e68 Make explanation consistent with command 
To reduce confusion of the reader.  Fixes a likely cut & paste error.

Signed-off-by: Simon Leinen <simon.leinen@gmail.com>
 2015-04-01 21:54:21 +02:00
Alexander Morozov 7101419c1c Merge pull request #11990 from duglin/11985-RemoveDeadCode 
Remove dead code looking for non-existent err msg
 2015-04-01 10:46:10 -07:00
Jay 6e46204ab8 Added information about accessing host directory on Windows. 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-04-01 13:36:43 -04:00
André Martins 8f7ac20bac Fixes docker events since beginning of unix time 
Fixes issue #11555
Applied a workaround to check if since and until flags are valid or not.

Signed-off-by: André Martins <martins@noironetworks.com>
 2015-04-01 18:14:59 +01:00
Alexander Morozov 624de8a9cd Merge pull request #11949 from MabinGo/fix_randombug_in_eventtest 
Fix random error in cli events test
 2015-04-01 09:26:48 -07:00
Doug Davis 39908fc6d9 Add support for more advanced ${xxx:...} syntax 
Just ${xxx:+...} and ${xxx:-...} for now

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-01 08:11:15 -07:00
moxiegirl 39711c8b26 Merge pull request #11969 from powo/patch-1 
Update networking.md (IPv6 wrong prefix)
 2015-04-01 07:45:31 -07:00
Doug Davis d351aef8af Remove dead code looking for non-existent err msg 
Closes #11985

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-01 07:37:10 -07:00
moxiegirl dc564d8cf8 Merge pull request #11972 from thaJeztah/docs-fix-heading-level 
docs: fix heading level of logging drivers
 2015-04-01 07:34:45 -07:00
moxiegirl f73109b883 Merge pull request #11982 from sunyuan3/docker-run 
Fix typoes in docker-run.1.md
 2015-04-01 07:32:06 -07:00
James Turnbull a73b7354a6 Merge pull request #11954 from ankushagarwal/#11953 
Use different host and container port for clarity
 2015-04-01 09:21:15 -04:00
Yuan Sun a44451d40e Fix typoes in docker-run.1.md 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-04-01 17:09:01 +08:00
Deng Guangxing f5a401d3fe docker info show logging driver info 
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
 2015-04-01 16:05:14 +08:00
Mabin e15c3e36cc Fix random bug in cli events test 
Signed-off-by: Mabin <bin.ma@huawei.com>
 2015-04-01 11:00:01 +08:00
Lei Jitang 7105f93a72 Add some missing option to bash completion 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-04-01 10:35:05 +08:00
Michael Crosby 98cfa2aecd Merge pull request #11975 from duglin/FixOOMTest 
Increase timeout on TestRunOOMExitCode test
 2015-03-31 17:24:26 -07:00
Doug Davis 8d1455d88b Increase timeout on TestRunOOMExitCode test 
I can never get it to work for me when its just 3 seconds.
With this change it generates the OOM message around 17 seconds, but
I increased the timeout to 30 for people with slower machines

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-03-31 16:57:43 -07:00
Michael Crosby e736f16bbd Merge pull request #11930 from unclejack/broadcastwriter_refactor 
pkg/broadcastwriter: use []byte to lower alloc
 2015-03-31 16:47:23 -07:00
Michael Crosby 03d3d79b2b Remove jobs from registry.Service 
This makes `registry.Service` a first class type and does not use jobs
to interact with this type.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-03-31 16:38:04 -07:00
Jessie Frazelle 596ddef7d7 Merge pull request #11967 from LK4D4/fix_panic 
Avoid ServeApi race condition
 2015-03-31 16:37:32 -07:00
Sebastiaan van Stijn f855d5dde7 Fix heading level of logging drivers 
Syslog was a heading-2, but should be heading-3;
changed the headings to heading-4 to match the
"network settings" section.

Also changed "Log driver" to "logging driver" for JSON.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-04-01 01:07:22 +02:00
Wolfgang Powisch 6a47c70d60 Update networking.md 
Signed-off-by: Wolfgang Powisch <powo@powo.priv.at>
 2015-04-01 00:44:41 +02:00
unclejack 153f98bad5 pkg/broadcastwriter: reset after 4 KB w/o stream 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2015-04-01 01:26:19 +03:00
Alexander Morozov c717475714 Fix panic in integration tests 
Closing activationLock only if it's not closed already. This is needed
only because integration tests using docker code directly and doesn't
care about global state.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-03-31 15:12:15 -07:00
Derek McGowan 62009ef77e Use vendored v2 registry api 
Update registry package to use the v2 registry api from distribution. Update interfaces to directly take in digests.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-03-31 15:02:27 -07:00
Alexander Morozov d15d1674c3 Skip heavy operations if there is no jsonlog writers 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-01 01:02:18 +03:00
unclejack 5550a46946 pkg/broadcastwriter: use []byte to lower alloc 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2015-04-01 01:02:18 +03:00
unclejack b535ed3595 pkg/jsonlog: add JSONLogBytes for low allocations 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2015-04-01 01:02:18 +03:00
unclejack f26f405b00 pkg/broadcastwriter: add test w/ "" stream only 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2015-04-01 01:02:18 +03:00
Derek McGowan f011d722ce Vendor distribution v2 api 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-03-31 14:58:45 -07:00
Michael Crosby 7dd79dcc7b Merge pull request #11952 from ankushagarwal/#11581 
Add some documentation to pkg/system
 2015-03-31 14:58:32 -07:00
Michael Crosby ded5c73deb Merge pull request #11962 from vbatts/vbatts-promote_overlay 
graphdriver: promote overlay above vfs
 2015-03-31 14:39:08 -07:00
Alexander Morozov e4545ed8cb Merge pull request #11963 from crosbymichael/api-server 
API Server Socket Refactoring
 2015-03-31 14:25:32 -07:00
Vincent Batts 2c72ff1dbf graphdriver: promote overlay above vfs 
It's about time to let folks not hit 'vfs', when 'overlay' is supported
on their kernel. Especially now that v3.18.y is a long-term kernel.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2015-03-31 17:18:49 -04:00
Michael Crosby da6248751b Merge pull request #11961 from dmcgowan/fix-build-progress-output-11849 
Fix progress reader output on close
 2015-03-31 14:04:33 -07:00
Jessie Frazelle 749a117267 Merge pull request #11934 from cpuguy83/fix_volume_symlink_check 
Fix volume symlink check
 2015-03-31 13:56:23 -07:00
Arnaud Porterie e04acf8a38 Merge pull request #11045 from brahmaroutu/fixtest_10964 
Skip TestEventsImagePull unless network is available
 2015-03-31 13:48:54 -07:00
Michael Crosby 62806cc85e Refactor API socket handling 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-03-31 13:37:49 -07:00
Michael Crosby b85cf5da5e Merge pull request #11958 from LK4D4/fix_portmapper_race 
Move portmapper initialization to var block
 2015-03-31 13:23:45 -07:00
Jessie Frazelle a381a1bb03 Merge pull request #11473 from pradeepchhetri/docker-wait-cli-integration-test 
Added basic integration tests for docker wait command
 2015-03-31 13:23:23 -07:00
Derek McGowan aa3083f577 Fix progress reader output on close 
Currently the progress reader won't close properly by not setting the close size.

fixes #11849

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-03-31 13:17:25 -07:00
Jessie Frazelle b875e126dd Merge pull request #11137 from rhvgoyal/fix-removal 
Do not remove container if underlying resource cleanup failed
 2015-03-31 13:09:23 -07:00
Brian Goff 63708dca8a Use getResourcePath instead 
Also cleans up tests to not shell out for file creation.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-03-31 15:10:30 -04:00
Ankush Agarwal e94a48ffc8 Add some documentation to pkg/system 
Partially addresses #11581

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
 2015-03-31 12:00:33 -07:00
Ankush Agarwal 8caf8f0a79 Use different host and container port for clarity 
Fixes #11953

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
 2015-03-31 11:59:58 -07:00
Michael Crosby 7609d52797 Move Profiler into specific http.Handler 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-03-31 11:38:17 -07:00
Alexander Morozov 584180fce7 Initialize portMapper in RequestPort too 
Api requesting port for daemon before init_networkdriver called.
Problem is that now initialization of api depends on initialization of
daemon and their intializations runs in parallel. Proper fix will be
just do it sequentially. For now I don't want refactor it, because it
can bring additional problems in 1.6.0.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-03-31 11:30:57 -07:00