toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,528 Commits 3 Branches 295 Tags
d1a21ef13654af69cc1579bbe310242ee9c158da
Commit Graph
16528 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Bray d1a21ef136 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>
Upstream-commit: 12c85f3671e2bc981eb246e73daa7ecf37fb274f
Component: engine
 2015-07-07 13:51:17 -04:00
Brian Goff 6127908005 Merge pull request #14375 from coolljt0725/fix_test_events_default_empty 
Fix test TestEventsDefaultEmpty. Fixes #14360
Upstream-commit: 10bbf62081ac85b17a93d79ba43eec43bebe468c
Component: engine
 2015-07-07 10:37:40 -04:00
moxiegirl 63dcc74119 Merge pull request #14307 from kolyshkin/readme-fixes 
README.md: fix cgroups/namespaces name and link
Upstream-commit: 833cdd28ed668291bca8eb5ee5ba73a77523eafb
Component: engine
 2015-07-07 06:09:20 -07:00
Antonio Murdaca 1d7351e687 Merge pull request #14428 from sunyuan3/TestPushBusyboxImage 
Correct wrong comment of TestPushBusyboxImage.
Upstream-commit: 61418e39d534fcd4cf13d5559133da6d0834feb0
Component: engine
 2015-07-07 14:44:08 +02:00
Yuan Sun 13acfe3c90 Correct wrong comment of TestPushBusyboxImage. 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: f244ed2531721ec8b3240d1ec8e2bd9f9acf466c
Component: engine
 2015-07-07 16:10:37 +08:00
Sebastiaan van Stijn f43c5d8e7a Merge pull request #14406 from duglin/tweakCmdlineHelp 
Fix example in cmdline help text to have correct output
Upstream-commit: 270d7e1af8075f8c05f820d4a9a40f0aebd3ca28
Component: engine
 2015-07-07 09:26:13 +02:00
Sebastiaan van Stijn 48ac43bc1b Merge pull request #13987 from larsks/bug/7583 
Update docker commit man page re: volumes
Upstream-commit: 244141a8aa4b80c6e508eb408a536a56b783845b
Component: engine
 2015-07-07 09:16:54 +02:00
Sebastiaan van Stijn 48bdf6fd55 Merge pull request #14275 from ankushagarwal/runtime-metrics-docs-stats 
Add Docker stats to runtime metrics article
Upstream-commit: 81964ca555aa595600b0d706ad68783e12919627
Component: engine
 2015-07-07 08:21:31 +02:00
Sebastiaan van Stijn 02dcc46d4e Merge pull request #14095 from timwraight/master 
Clarify .dockerignore example for Markdown files
Upstream-commit: a25ee91f1c163ef77539eafd0509ccfcf619106d
Component: engine
 2015-07-07 07:59:39 +02:00
Kir Kolyshkin a32ec20c5e 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>
Upstream-commit: 68efb27e990a52478d9927911757a07910244dc5
Component: engine
 2015-07-06 22:51:31 -07:00
Kir Kolyshkin 5bedc178b2 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>
Upstream-commit: 7e309aed4e23ad5dfa94b9279be9a4b075aab0a8
Component: engine
 2015-07-06 22:45:56 -07:00
Lei Jitang 5bdb87278d Fix test TestEventsDefaultEmpty. Fixes #14360 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 28028312183126102b8eb260b7112cc37dd5aca9
Component: engine
 2015-07-07 11:27:00 +08:00
Doug Davis 584e40e2dd Merge pull request #14409 from vdemeester/fix-testRequires-network 
Fix integration tests with testRequires(c, Network)
Upstream-commit: 58edd21c05e69a7dfd522f5971fcf994acd7cb41
Component: engine
 2015-07-06 23:08:34 -04:00
Doug Davis 4813a5b1aa 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>
Upstream-commit: aea0fd0115ab99a9797cc2ba4d9ef530f76c3ecc
Component: engine
 2015-07-06 17:51:09 -07:00
David Calavera 0958d62678 Merge pull request #14414 from jfrazelle/fix-rpms 
fix rpms
Upstream-commit: 2905fe4806cd00ed267138b4e2b94a80a2b7ad0d
Component: engine
 2015-07-06 17:12:38 -07:00
moxiegirl d3498560e9 Merge pull request #14154 from chrismckinnel/master 
Fix a broken link to .dockerignore
Upstream-commit: 6ffce0131c6be276d5919dff0500db7a67065b4d
Component: engine
 2015-07-06 15:48:25 -07:00
Ankush Agarwal 8d8ca6624e Add Docker stats to runtime metrics article 
Fixes #13170

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: 274c838ced96e1b7f9b6c5854856004d0b130627
Component: engine
 2015-07-06 15:40:26 -07:00
Sebastiaan van Stijn bc59fc9e10 Merge pull request #14411 from duglin/Issue14407 
Add some missing events to the API docs
Upstream-commit: 4f69609ac2e469858596f8bacba422433e8b336f
Component: engine
 2015-07-06 23:29:56 +02:00
Jessica Frazelle 863d4d7ae6 fix rpms 
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 76a853de6eee072e4874a64e4c5ffcceacdccbf1
Component: engine
 2015-07-06 14:14:26 -07:00
Vincent Demeester 7c1cdd2da7 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>
Upstream-commit: 6e4c6da81916e25081c32d3e5f8880ef4d03ad36
Component: engine
 2015-07-06 22:08:35 +02:00
Doug Davis c016079ee2 Add some missing events to the API docs 
Closes #14407

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 4bb3c253e83454e00381723f17ca69dd4e9b3d7a
Component: engine
 2015-07-06 11:39:37 -07:00
Vincent Batts 07c93dcdba Merge pull request #14127 from vbatts/vbatts-dm-active-external 
pkg/devicemapper: external device activation
Upstream-commit: c7492126ef68786a4c57e5e2affb7cba293be652
Component: engine
 2015-07-06 14:07:33 -04:00
Lars Kellogg-Stedman d49aa7e5dc 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>
Upstream-commit: a9747895375a27e0f4d46d9cf8f501815e5b2642
Component: engine
 2015-07-06 10:16:21 -04:00
Doug Davis f17280b05c Merge pull request #14344 from Mashimiao/add-json-check-for-execcreate 
api/server: Add missing json check
Upstream-commit: 26a35dd09b4faf39a99ff224f5cd4e14ae368585
Component: engine
 2015-07-05 19:04:12 -04:00
Sebastiaan van Stijn 5976223106 Merge pull request #14394 from moxiegirl/carry-pr-13361 
Carries and closes 13361
Upstream-commit: 7fde07ea16133f5e2d76050efb47154c81963224
Component: engine
 2015-07-05 11:30:17 +02:00
Mary Anthony 461cafcee4 Carries and closes 13361 
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 2c5e044b59c5f37381a22d9a3e8414314802c225
Component: engine
 2015-07-04 18:12:52 -07:00
moxiegirl ef90db9fac Merge pull request #14392 from moxiegirl/fix-fedora-table 
Table formatting was broken
Upstream-commit: 7aa554c4447adc4186bc554d75f7e5ae48e45fb5
Component: engine
 2015-07-04 16:30:17 -07:00
Sebastiaan van Stijn 326b0850c7 Merge pull request #14235 from mlarcher/mlarcher-patch-2 
Add workaround in docs for git bash usage issue
Upstream-commit: 57286aad252a4f22e499c85dd1c27e034f7d87e2
Component: engine
 2015-07-04 21:00:53 +02:00
James Turnbull a4234c8502 Merge pull request #14309 from Tenk42/14287-wheezy-link-broken-on-debian-page 
Fixing Wheezy link on debian installation page
Upstream-commit: f240bb5e941f664b23e7c625378bf72bc882ea71
Component: engine
 2015-07-04 14:57:00 -04:00
Mary Anthony e0231e4d94 Table formatting was broken 
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 762214ccc860cbe41cb84a4078adfbe4cd92e149
Component: engine
 2015-07-04 07:32:58 -07:00
Antonio Murdaca da961c7e1a Merge pull request #14374 from Mashimiao/clinent-load-tiny-typo-fix 
client/load: tiny typo fix
Upstream-commit: 36958ba49b55c5b03c281ee1efe2b8025d29cb85
Component: engine
 2015-07-04 00:24:21 +02:00
Alexander Morozov e0d9759fc8 Merge pull request #14383 from runcom/runconfig-merge-cleanup 
add break after key is found in for loop
Upstream-commit: 90bc5513a96c662f827f6d2d364ca93fc721ed1e
Component: engine
 2015-07-03 15:18:09 -07:00
Antonio Murdaca ebc23e68c9 Add break after key is found in for loop 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: a5be8034589fe024ce421b4a7d34739be2a1a8af
Component: engine
 2015-07-03 20:37:34 +02:00
Sebastiaan van Stijn eb2ef8d257 Merge pull request #14195 from ch3lo/master 
update in Kitematic OS support
Upstream-commit: bca32648f4ac21b5185cdba2d1fd50b5f8aa1466
Component: engine
 2015-07-03 18:05:27 +02:00
Marcelo Salazar fdd86a6c80 update in Kitematic OS support 
Kitematic now support Windows

Signed-off-by: Marcelo Salazar R <chelosalazar@gmail.com>
Upstream-commit: 1b3bde47ef5a7c4b178bb3d0cab6e4238e5cc124
Component: engine
 2015-07-03 12:32:00 -03:00
Sebastiaan van Stijn 057d94db14 Merge pull request #14159 from tristan0x/patch-1 
docker-hub Admin right gives access to build logs
Upstream-commit: a89f4e36ab7e8b927c92fa5a170213e7135ae75e
Component: engine
 2015-07-03 16:56:04 +02:00
Tristan Carel 907298f6f9 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>
Upstream-commit: 515df52f19314f48d4a2cb4aa7f672d1e4eb7703
Component: engine
 2015-07-03 16:29:30 +02:00
Doug Davis 87e1c90703 Merge pull request #14377 from coolljt0725/validate_restart_policy 
Validate restart policy. Fixes #14351
Upstream-commit: 0dedadd4d6565b497030456be6512c85215229b3
Component: engine
 2015-07-03 07:01:44 -05:00
Lei Jitang 0d4791f838 Validate restart policy. Fixes #14351 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: f3faf599250e6de3dff340a2e9a72c89c31ba9db
Component: engine
 2015-07-03 17:33:33 +08:00
mlarcher 45f765fb3b 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>
Upstream-commit: 33be2c5d2ed15a2f9bb272ac9492ad36113ddb32
Component: engine
 2015-07-03 09:07:44 +02:00
Sebastiaan van Stijn df25bd0e9a Merge pull request #14378 from airandfingers/patch-2 
Edit "Working with Containers" page for readability
Upstream-commit: 7b0666f568ac46f10b328c18b7090e563593f88e
Component: engine
 2015-07-03 08:43:50 +02:00
ayoshitake 26b82c6f4b Edit "Working with Containers" page for readability 
Signed-off-by: ayoshitake <airandfingers@gmail.com>
Upstream-commit: 0ed7fd46b6a02203bb6ddaf5cb004641e127da49
Component: engine
 2015-07-02 23:10:36 -07:00
Ma Shimiao 08ad652976 api/server: Add missing json check 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 801a7fed19643b7b89929daf53b37e0630e05586
Component: engine
 2015-07-03 08:52:32 +08:00
Ma Shimiao ed646be3f9 client/load: tiny typo fix 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 87cfc2bc58628eb432e326439c1fceeff03704b8
Component: engine
 2015-07-03 08:37:27 +08:00
James Turnbull b1f999a90f Merge pull request #14190 from ankushagarwal/experimentalDownloadLink 
Document the location of experimental binary
Upstream-commit: d7326bd78767bfd5d2c7025667b5d3437793c5f4
Component: engine
 2015-07-02 20:14:15 -04:00
James Turnbull 5f24ffae53 Merge pull request #14295 from Lennie/patch-1 
Fix for broken link
Upstream-commit: 7dc8e77cc7ef5a95b2a1b688ff963aab3eed81ff
Component: engine
 2015-07-02 19:24:57 -04:00
Sebastiaan van Stijn 5714eb0efd Merge pull request #14104 from mariusGundersen/patch-1 
Spelling
Upstream-commit: a45576ab4014f2d98af0a9df61873c7f609eff56
Component: engine
 2015-07-03 01:03:58 +02:00
Ankush Agarwal abd0d1c1c1 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>
Upstream-commit: 01cfb70b0abb4a49c3f04101d8a8d6f59cd69ad0
Component: engine
 2015-07-02 15:59:13 -07:00
David Calavera 716fca6f61 Merge pull request #14349 from hqhq/hq_error_for_todisk 
Show error message when todisk failed
Upstream-commit: 5b2d14fbbf1f4c237cf8f2a3c1b6ec802a68f135
Component: engine
 2015-07-02 15:56:56 -07:00
Jessie Frazelle 901d9ff041 Merge pull request #14064 from jfrazelle/no-cache-for-experimental 
add no cache for experimental builds bc cloudfront
Upstream-commit: 9356c76d9f6e285e71f04df33ef7870455a42775
Component: engine
 2015-07-02 17:24:29 -04:00