clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-27 00:20:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,528 Commits 9 Branches 112 Tags
12c85f3671e2bc981eb246e73daa7ecf37fb274f
Commit Graph
16528 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Bray 12c85f3671 Update windows.md 
With apologies (it wasn't clear from the contributing guidelines how this project feels about PRs for one or two word doc fixes).

Signed-off-by: Erik M. Bray <erik.m.bray@gmail.com>
 2015-07-07 13:51:17 -04:00
Brian Goff 10bbf62081 Merge pull request #14375 from coolljt0725/fix_test_events_default_empty 
Fix test TestEventsDefaultEmpty. Fixes #14360
 2015-07-07 10:37:40 -04:00
moxiegirl 833cdd28ed Merge pull request #14307 from kolyshkin/readme-fixes 
README.md: fix cgroups/namespaces name and link
 2015-07-07 06:09:20 -07:00
Antonio Murdaca 61418e39d5 Merge pull request #14428 from sunyuan3/TestPushBusyboxImage 
Correct wrong comment of TestPushBusyboxImage.
 2015-07-07 14:44:08 +02:00
Yuan Sun f244ed2531 Correct wrong comment of TestPushBusyboxImage. 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-07-07 16:10:37 +08:00
Sebastiaan van Stijn 270d7e1af8 Merge pull request #14406 from duglin/tweakCmdlineHelp 
Fix example in cmdline help text to have correct output
 2015-07-07 09:26:13 +02:00
Sebastiaan van Stijn 244141a8aa Merge pull request #13987 from larsks/bug/7583 
Update docker commit man page re: volumes
 2015-07-07 09:16:54 +02:00
Sebastiaan van Stijn 81964ca555 Merge pull request #14275 from ankushagarwal/runtime-metrics-docs-stats 
Add Docker stats to runtime metrics article
 2015-07-07 08:21:31 +02:00
Sebastiaan van Stijn a25ee91f1c Merge pull request #14095 from timwraight/master 
Clarify .dockerignore example for Markdown files
 2015-07-07 07:59:39 +02:00
Kir Kolyshkin 68efb27e99 daemon.md: fix placement of exec driver heading 
Options for zfs storage driver were incorrectly placed
under 'exec driver options' header. Move the header to
the correct place.

Signed-off-by: Kir Kolyshkin <kir@openvz.org>
 2015-07-06 22:51:31 -07:00
Kir Kolyshkin 7e309aed4e README.md: fix cgroups/namespaces name and link 
The features Docker relies on are called "cgroups" and "namespaces",
so fix the language accordingly.

Also for cgroups, provide a link to Linux kernel documentation that
is more relevant (and deep) than the Wikipedia article.

Cc: Ankush Agarwal <ankushagarwal11@gmail.com>
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
 2015-07-06 22:45:56 -07:00
Lei Jitang 2802831218 Fix test TestEventsDefaultEmpty. Fixes #14360 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-07-07 11:27:00 +08:00
Doug Davis 58edd21c05 Merge pull request #14409 from vdemeester/fix-testRequires-network 
Fix integration tests with testRequires(c, Network)
 2015-07-06 23:08:34 -04:00
Doug Davis aea0fd0115 Fix example in cmdline help text to have correct output 
Showing "$$ exit 13" caught my eye and wasn't correct.
While in there I also made it so the following paragraph didn't go past 80 chars

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-07-06 17:51:09 -07:00
David Calavera 2905fe4806 Merge pull request #14414 from jfrazelle/fix-rpms 
fix rpms
 2015-07-06 17:12:38 -07:00
moxiegirl 6ffce0131c Merge pull request #14154 from chrismckinnel/master 
Fix a broken link to .dockerignore
 2015-07-06 15:48:25 -07:00
Ankush Agarwal 274c838ced Add Docker stats to runtime metrics article 
Fixes #13170

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
 2015-07-06 15:40:26 -07:00
Sebastiaan van Stijn 4f69609ac2 Merge pull request #14411 from duglin/Issue14407 
Add some missing events to the API docs
 2015-07-06 23:29:56 +02:00
Jessica Frazelle 76a853de6e fix rpms 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-07-06 14:14:26 -07:00
Vincent Demeester 6e4c6da819 Fix integration tests with testRequires(c, Network) 
It seems http://hub.docker.com is not accessible anymore, so switching
to https://hub.docker.com for testRequires(c, Network).

Adds a Timeout check on the TestRequirement to *panic* if there is a
timeout (fail fast).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-07-06 22:08:35 +02:00
Doug Davis 4bb3c253e8 Add some missing events to the API docs 
Closes #14407

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-07-06 11:39:37 -07:00
Vincent Batts c7492126ef Merge pull request #14127 from vbatts/vbatts-dm-active-external 
pkg/devicemapper: external device activation
 2015-07-06 14:07:33 -04:00
Lars Kellogg-Stedman a974789537 Update docker commit man page re: volumes 
Update the man page for 'docker commit' to make explicit the fact that
'commit' does not save data in volumes.

Addresses comments in #7583

Signed-off-by: Lars Kellogg-Stedman <lars@redhat.com>
 2015-07-06 10:16:21 -04:00
Doug Davis 26a35dd09b Merge pull request #14344 from Mashimiao/add-json-check-for-execcreate 
api/server: Add missing json check
 2015-07-05 19:04:12 -04:00
Sebastiaan van Stijn 7fde07ea16 Merge pull request #14394 from moxiegirl/carry-pr-13361 
Carries and closes 13361
 2015-07-05 11:30:17 +02:00
Mary Anthony 2c5e044b59 Carries and closes 13361 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-07-04 18:12:52 -07:00
moxiegirl 7aa554c444 Merge pull request #14392 from moxiegirl/fix-fedora-table 
Table formatting was broken
 2015-07-04 16:30:17 -07:00
Sebastiaan van Stijn 57286aad25 Merge pull request #14235 from mlarcher/mlarcher-patch-2 
Add workaround in docs for git bash usage issue
 2015-07-04 21:00:53 +02:00
James Turnbull f240bb5e94 Merge pull request #14309 from Tenk42/14287-wheezy-link-broken-on-debian-page 
Fixing Wheezy link on debian installation page
 2015-07-04 14:57:00 -04:00
Mary Anthony 762214ccc8 Table formatting was broken 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-07-04 07:32:58 -07:00
Antonio Murdaca 36958ba49b Merge pull request #14374 from Mashimiao/clinent-load-tiny-typo-fix 
client/load: tiny typo fix
 2015-07-04 00:24:21 +02:00
Alexander Morozov 90bc5513a9 Merge pull request #14383 from runcom/runconfig-merge-cleanup 
add break after key is found in for loop
 2015-07-03 15:18:09 -07:00
Antonio Murdaca a5be803458 Add break after key is found in for loop 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-07-03 20:37:34 +02:00
Sebastiaan van Stijn bca32648f4 Merge pull request #14195 from ch3lo/master 
update in Kitematic OS support
 2015-07-03 18:05:27 +02:00
Marcelo Salazar 1b3bde47ef update in Kitematic OS support 
Kitematic now support Windows

Signed-off-by: Marcelo Salazar R <chelosalazar@gmail.com>
 2015-07-03 12:32:00 -03:00
Sebastiaan van Stijn a89f4e36ab Merge pull request #14159 from tristan0x/patch-1 
docker-hub Admin right gives access to build logs
 2015-07-03 16:56:04 +02:00
Tristan Carel 515df52f19 Rewrite DockerHub group permissions documentation 
On behalf of @moxiegirl
    https://gist.github.com/moxiegirl/1c34957b9edc0f6d528c#file-gistfile1-md

Signed-off-by: Tristan Carel <tristan.carel@gmail.com>
 2015-07-03 16:29:30 +02:00
Doug Davis 0dedadd4d6 Merge pull request #14377 from coolljt0725/validate_restart_policy 
Validate restart policy. Fixes #14351
 2015-07-03 07:01:44 -05:00
Lei Jitang f3faf59925 Validate restart policy. Fixes #14351 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-07-03 17:33:33 +08:00
mlarcher 33be2c5d2e Add workaround in docs for git bash usage issue 
When using boot2docker through git bash, there is a nasty issue when trying to share a folder, due to how git bash parses the URIs. The issue is explained in [issue #12751](https://github.com/docker/docker/issues/12751) but needs more visibility in the docs.

Signed-off-by: Matthieu Larcher <github@ringabell.org>
 2015-07-03 09:07:44 +02:00
Sebastiaan van Stijn 7b0666f568 Merge pull request #14378 from airandfingers/patch-2 
Edit "Working with Containers" page for readability
 2015-07-03 08:43:50 +02:00
ayoshitake 0ed7fd46b6 Edit "Working with Containers" page for readability 
Signed-off-by: ayoshitake <airandfingers@gmail.com>
 2015-07-02 23:10:36 -07:00
Ma Shimiao 801a7fed19 api/server: Add missing json check 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-07-03 08:52:32 +08:00
Ma Shimiao 87cfc2bc58 client/load: tiny typo fix 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-07-03 08:37:27 +08:00
James Turnbull d7326bd787 Merge pull request #14190 from ankushagarwal/experimentalDownloadLink 
Document the location of experimental binary
 2015-07-02 20:14:15 -04:00
James Turnbull 7dc8e77cc7 Merge pull request #14295 from Lennie/patch-1 
Fix for broken link
 2015-07-02 19:24:57 -04:00
Sebastiaan van Stijn a45576ab40 Merge pull request #14104 from mariusGundersen/patch-1 
Spelling
 2015-07-03 01:03:58 +02:00
Ankush Agarwal 01cfb70b0a Document the location of experimental binary 
Some devs might want to download the binary directly,
especially for systems where the install script does not
work.

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
 2015-07-02 15:59:13 -07:00
David Calavera 5b2d14fbbf Merge pull request #14349 from hqhq/hq_error_for_todisk 
Show error message when todisk failed
 2015-07-02 15:56:56 -07:00
Jessie Frazelle 9356c76d9f Merge pull request #14064 from jfrazelle/no-cache-for-experimental 
add no cache for experimental builds bc cloudfront
 2015-07-02 17:24:29 -04:00