toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,871 Commits 3 Branches 295 Tags
efeecbbbfbefb3285c1903ade7ff702ca858d73e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Rothfusz 254ce5fef5 Merge pull request #3542 from SvenDowideit/curl-prepare-commit-msg 
move the contributing hook into contrib, and use curl in the same way as the gofmt above
Upstream-commit: bbfc531b51cb17e97022ff0e904f91faac48713f
Component: engine
 2014-01-27 12:09:03 -08:00
Andy Rothfusz d680ae54b5 Merge pull request #3781 from mattymo/patch-1 
Clean up grammar on puppet.rst
Upstream-commit: 093531ddb7f4ee53cd166bfd9316af0c1de7424c
Component: engine
 2014-01-27 12:06:43 -08:00
Andy Rothfusz 8e2497b678 Merge pull request #3773 from mnaberez/supervisord-apache2-example 
Use exec to replace bash with apache2 after environment is set up
Upstream-commit: adae0b248d6f6732f15ef96f856ac097d038a181
Component: engine
 2014-01-27 12:01:59 -08:00
Andy Rothfusz 0e5f62a6b2 Merge pull request #3770 from aaronfeng/fix-image-name-pos 
move image name into correct position
Upstream-commit: ef37fdd1a853fbef8cbabe1a34c527d278589067
Component: engine
 2014-01-27 11:56:36 -08:00
Andy Rothfusz 0badcc35ea Fix TOC for Articles 
Upstream-commit: 6cae33ca0f78ce8b7f1250e1f85828cfb242b12f
Component: engine
 2014-01-23 18:55:26 -08:00
Andy Rothfusz 5ee57b9d0c Merge pull request #3730 from SvenDowideit/JSON-RUN-format-docs 
talk about the new exec form of RUN (Closes #3723) implemented by #3558
Upstream-commit: a71e7fe8ab0fdee28b4cf062d17082568b383002
Component: engine
 2014-01-23 15:54:00 -08:00
Andy Rothfusz a01f048b9e Merge pull request #3716 from johngmyers/patch-1 
Grammar fixes and wording improvements
Upstream-commit: 700db10c850f4721ab890c1d4f0fa22a2fbaa29d
Component: engine
 2014-01-22 12:01:13 -08:00
Andy Rothfusz b2fe863a63 Merge pull request #3713 from SvenDowideit/document-bind-mount-file 
bind mounts work for files - give an example, as its very very useful.
Upstream-commit: 9a2e673f4f5999c5b3a282c7f6ffe87793dfd5e5
Component: engine
 2014-01-22 11:54:41 -08:00
Andy Rothfusz a633d7a05c Merge pull request #3688 from shykes/docs-simplify-basic-usage 
Simplify basic usage docs
Upstream-commit: 62c456398767b3e8155ec6d0df265cb5fb464438
Component: engine
 2014-01-21 11:41:32 -08:00
Andy Rothfusz 1b8b44e502 Merge pull request #3690 from shykes/cleanup-maintainers 
Cleanup maintainers
Upstream-commit: ba4ae40445d40545a83b5dc9040c1c4942bb51ce
Component: engine
 2014-01-21 11:18:23 -08:00
Andy Rothfusz 8a428ead43 Merge pull request #3687 from shykes/docs-intro 
docs: harmonize intro paragraph with website
Upstream-commit: fb919137bec47bb4922a2571a0f9410a5887c670
Component: engine
 2014-01-21 11:02:55 -08:00
Andy Rothfusz 08877d190e Merge pull request #3700 from jamtur01/fixedtoc 
Fixed commandline/index warning in TOC
Upstream-commit: 31274ffccb954bde88c973719c949894cc02d314
Component: engine
 2014-01-21 10:52:13 -08:00
Andy Rothfusz 1f774297a3 Reordering to make FAQ last 
Upstream-commit: 90b52b7e0623271ec0351ffb6dc7a7586bbe6e4d
Component: engine
 2014-01-20 17:11:03 -08:00
Andy Rothfusz 1665fbf899 Merge pull request #3618 from shykes/docs-cleanup-install 
Docs cleanup install
Upstream-commit: acf43b4da7c7f81f5774f341828b8b862f204c04
Component: engine
 2014-01-20 17:10:02 -08:00
Andy Rothfusz 59aa210c0d Merge pull request #3600 from SvenDowideit/ghost-status-doc 
Ghost status doc
Upstream-commit: b38d3154c85bf66db7c84df58ce5c24696a841b5
Component: engine
 2014-01-20 16:51:47 -08:00
Andy Rothfusz 28e9f7be0b Merge pull request #3650 from tianon/fix-doc-man-generation 
Fix docs man page generation and add Dockerfile man page
Upstream-commit: 6dfbbaa4ffa91764ad4c332808d3cc9f76aa37b4
Component: engine
 2014-01-20 13:44:01 -08:00
Andy Rothfusz 31ec62f475 Merge pull request #3620 from jamtur01/refman 
Added Reference Manual
Upstream-commit: ebaa92b20879339e66bfd995a340a235cfb25046
Component: engine
 2014-01-17 13:42:22 -08:00
Andy Rothfusz f6132defa4 Merge pull request #3583 from metalivedev/3497-copyright 
Update docs/NOTICE copyrights to 2014
Upstream-commit: 2cdbc719c58978bc9d23098b45b473d17956dae0
Component: engine
 2014-01-16 12:18:34 -08:00
Andy Rothfusz b04df34a21 Merge pull request #3598 from tianon/fix-vieux-docs-errors-again 
Fix odd issues with "make docs", add "make docs-shell", and canonicalize...
Upstream-commit: cdea7d3b5f64b8d255bab657a79082ec282da96a
Component: engine
 2014-01-15 13:42:28 -08:00
Andy Rothfusz 403789e5fb Merge pull request #3593 from dotcloud/fix_doc 
fix doc, load and get
Upstream-commit: 0113c087b22c7ffe03c4745bc9d05a0523ecbe5c
Component: engine
 2014-01-15 13:33:00 -08:00
Andy Rothfusz 07247c041c Merge pull request #3585 from tianon/remove-uid-ns-reference 
Remove reference to nonexistent CONFIG_UID_NS
Upstream-commit: be44bf81704bd06c5665759d24612c0b1e205a81
Component: engine
 2014-01-14 11:37:00 -08:00
Andy Rothfusz aa714b58c1 Merge pull request #3586 from flavio/add_openSUSE_installation_docs 
Added document explaining openSUSE installation
Upstream-commit: da78dd0eb82419f7f7438649ca95fbe6741dd5d1
Component: engine
 2014-01-14 11:36:15 -08:00
Andy Rothfusz 197d847462 Merge pull request #3584 from tianon/fix-docs-dockerfile 
Fix docs Dockerfile to install correctly again
Upstream-commit: fe6c9e8fd7cef9bae224dd66a59696dcb025db49
Component: engine
 2014-01-13 17:42:20 -08:00
Andy Rothfusz 7cecb31982 Fixes 3497 
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: @metalivedev)
Upstream-commit: a92699ab6c0f93ee155b44145790dfeaf54cf1c8
Component: engine
 2014-01-13 17:12:53 -08:00
Andy Rothfusz e42df33e3b Merge pull request #3544 from SvenDowideit/build-image-cache 
add info and example of image cache in use when building
Upstream-commit: 6652416f4c18bd59575c7788747335eab7b4d304
Component: engine
 2014-01-13 11:10:29 -08:00
Andy Rothfusz 5f6e6869ed Merge pull request #3460 from tsaavik/patch-1 
Fixed error in group add example
Upstream-commit: c45cd9174ebc0c7dbc9f245166152ffd35cc72f4
Component: engine
 2014-01-08 15:45:23 -08:00
Andy Rothfusz ac3896d23f Merge pull request #3503 from gertvv/patch-1 
Hello World: fix detach behavior
Upstream-commit: 9a6333466bd97ea7903cefaa1e2348f3053483b8
Component: engine
 2014-01-08 11:44:26 -08:00
Andy Rothfusz 78d6110233 Merge pull request #3501 from proppy/patch-1 
google-compute-engine: fix typos
Upstream-commit: 187eed7da57104e1bda256b2ec18e098558c902d
Component: engine
 2014-01-08 11:40:30 -08:00
Andy Rothfusz ec9c950a6c Merge pull request #3430 from lsm5/fedora-official-image 
install instructions use unprefixed fedora image
Upstream-commit: b3addb5fb8814c0e76e2115404caef8a4efb393c
Component: engine
 2014-01-07 15:12:37 -08:00
Andy Rothfusz 5b404255d5 Merge pull request #3483 from lukaspustina/patch-1 
Missing redirect in line 85
Upstream-commit: 00ee6d1925688bda77d5055d7e4be1cbd8b64a07
Component: engine
 2014-01-07 15:11:02 -08:00
Andy Rothfusz dffdf1a269 Merge pull request #3462 from tsaavik/patch-2 
Simplified and streamlined Amazon Quickstart
Upstream-commit: 6f8a79c23c7ae80a18fb291c7dd65e12b8a6c037
Component: engine
 2014-01-07 15:09:35 -08:00
Andy Rothfusz fc2f70defb Merge pull request #3461 from jbeda/patch-1 
Update instructions for mtu flag for Docker on GCE
Upstream-commit: cf8063d1521e7e065e859b3e2f58e52d3b54a0f7
Component: engine
 2014-01-07 15:03:19 -08:00
Andy Rothfusz 2cdbf533f4 Merge pull request #3488 from jamtur01/1310 
Fixed #3481 - Added Ubuntu Saucy to installation
Upstream-commit: 3e10fe1a156b822e9daea5623411c187b2f5e2a1
Component: engine
 2014-01-07 14:56:03 -08:00
Andy Rothfusz a9ae796dbd Merge pull request #3473 from dhrp/docs-version-warning-fix 
[docs] Fix for wrong version warning on master instead of latest.
Upstream-commit: f43f3fa2187450aacbb72380903b109f45d3d0cd
Component: engine
 2014-01-06 16:26:04 -08:00
Andy Rothfusz c5289665c4 substantial spelling fix 
Upstream-commit: 58ec7855bc4f724a32f585f4455b5d954f335c3c
Component: engine
 2014-01-02 16:46:50 -08:00
Andy Rothfusz b8a11b19d9 Merge pull request #3437 from jamtur01/faqhere 
Fixed duplicate here references in FAQ
Upstream-commit: 949fde88df5c11447cea7115ce3a2bcf7c73ed6d
Component: engine
 2014-01-02 16:44:38 -08:00
Andy Rothfusz f9507b6c4d Merge pull request #3428 from jamtur01/port1.8 
Added some 1.7 API updates that were missing from 1.8
Upstream-commit: 8f4a54734fac24b4e7ce3019c9a693d7ed72c577
Component: engine
 2014-01-02 16:34:56 -08:00
Andy Rothfusz c44a0a380b Merge pull request #3389 from SvenDowideit/3366-simplify-volumes-documentation 
simplify the volumes documentation and mention more details
Upstream-commit: 9359d79c4f39c94b6fd1826bd66a41f9f4303b09
Component: engine
 2014-01-02 16:29:09 -08:00
Andy Rothfusz 1298c1b521 Merge pull request #3409 from Chris00/patch-1 
Mention lxc-checkconfig
Upstream-commit: 3b89187d0388ea386cf2c8e00361744442e46654
Component: engine
 2014-01-02 16:20:30 -08:00
Andy Rothfusz 8ca6e8443f Keep original transcript in Thatcher's voice 
and clarify that this is an update to the example.
Upstream-commit: 82a47b0e82367aa5f1b6d15816c7e66abdffb06a
Component: engine
 2014-01-02 16:17:52 -08:00
Andy Rothfusz 1aab0cdc3a Merge pull request #3399 from rgstephens/patch-1 
Update for Ubuntu 13.10
Upstream-commit: e0f07bc18614c5cc9065e75a3f43cdf4ca0ab605
Component: engine
 2014-01-02 16:14:47 -08:00
Andy Rothfusz 6c85a7de88 Merge pull request #3303 from crosbymichael/add-host-flag 
Add DOCKER_HOST env var for client
Upstream-commit: 1bc3f6b7b5fd8d15df2238fc77f5aeb9624a6582
Component: engine
 2013-12-30 15:54:37 -08:00
Andy Rothfusz 46e4624179 Merge pull request #3395 from jamtur01/basicsfixes 
Minor fixes to the basic command documentation
Upstream-commit: 643621133fafc7ea0b479cd636afd1e397055930
Component: engine
 2013-12-30 15:41:59 -08:00
Andy Rothfusz b284ad7fc3 Merge pull request #3394 from jamtur01/clifixes 
Numerous small fixes to the CLI documentation
Upstream-commit: 40aaebe56ac2de4294baacaa8aa61b20c3b2dabe
Component: engine
 2013-12-30 10:56:47 -08:00
Andy Rothfusz 038cb6fc8c Merge pull request #3371 from Grunny/volumes-typo-fix 
Fix typo in working with volumes doc page
Upstream-commit: e31f1f1eba498c3ff4073a43533e68bf993cbbcb
Component: engine
 2013-12-30 10:35:09 -08:00
Andy Rothfusz 09f511f43d Merge pull request #3312 from DeX77/master 
Installation for FrugalWare
Upstream-commit: 7e720d0a7797698c393ef2a204c87199463ca1a8
Component: engine
 2013-12-30 10:34:39 -08:00
Andy Rothfusz ea65bc7c4b Merge pull request #3380 from SvenDowideit/add-no-auth-note 
add a simple note to suggest to the user to use RUN curl/wget/tool if the URL they need is behind auth
Upstream-commit: 237868e9c3f9d1cb5f5311ef2710f83e1b3b898a
Component: engine
 2013-12-30 10:00:51 -08:00
Andy Rothfusz 8c76968d8f Merge pull request #3340 from jamtur01/apiport 
Fixed #3039 - Added clarification on port options in API
Upstream-commit: c654aea4f2a1eaffeed78eee03034421ce0e4240
Component: engine
 2013-12-24 14:34:13 -08:00
Andy Rothfusz b733ad7e1a Merge pull request #3302 from briandorsey/master 
Added a note about a networking work-around.
Upstream-commit: cda24e345cc742f99451e43d71b3dfb49562b2d4
Component: engine
 2013-12-23 11:25:20 -08:00
Andy Rothfusz 4c6a34d864 Merge pull request #3320 from jamtur01/privapi 
API documentation update for Privileged
Upstream-commit: 88037b28779d1a8c98f3bd6d30675fb2a0a70b1e
Component: engine
 2013-12-23 11:22:47 -08:00
Andy Rothfusz 4498576169 Merge pull request #3321 from jamtur01/apiclean 
Minor style cleanups to the API spec docs
Upstream-commit: 6cdd1aa3509ca0df7cda34a4b48cddf336acad32
Component: engine
 2013-12-23 11:20:56 -08:00
Andy Rothfusz 31ff556216 Merge pull request #3286 from pandrew/3279-documentation-docker-inspect 
Update docs to include images for docker inspect
Upstream-commit: efde305c05fe1969b6116f4ee777e5c37d30d139
Component: engine
 2013-12-19 14:50:55 -08:00
Andy Rothfusz 498aab65bc Merge pull request #3284 from jamtur01/faqmore 
Added some more items to the FAQ
Upstream-commit: 629cc2fce4a3c29cc0d1dea63d2c4729c729d001
Component: engine
 2013-12-19 11:32:53 -08:00
Andy Rothfusz 7df1c5a0f0 Merge pull request #3234 from creack/default_unix_path 
Default unix path
Upstream-commit: 1acefac97eafdb8e701763da8616b607be4f0510
Component: engine
 2013-12-17 16:24:01 -08:00
Andy Rothfusz ddd720195c Merge pull request #3228 from maztaim/patch-1 
Update binaries.rst
Upstream-commit: f630fbc7cf76fb123efff855de465a140e470754
Component: engine
 2013-12-17 13:10:08 -08:00
Andy Rothfusz e23f296b66 Merge pull request #3250 from vincentwoo/patch-1 
Update docker_remote_api.rst to reflect that the latest remote API version is 1.8
Upstream-commit: e61f327ec98c3e3620471970f8c07f5e68aac3d2
Component: engine
 2013-12-17 13:09:37 -08:00
Andy Rothfusz 80983f7def Merge pull request #3236 from dhrp/doc-master-warning 
Added warning when browsing master. & no longer hides alternative versions
Upstream-commit: 7ba0f1f421fea08728675d9ec424b97ad51cd695
Component: engine
 2013-12-17 11:17:17 -08:00
Andy Rothfusz 57ff515d90 Merge pull request #3249 from tianon/fix-sphinx-warning 
Fix minor sphinx warning
Upstream-commit: 30454bb85ca30cec9e904e75f5d9c4e436d54858
Component: engine
 2013-12-17 11:03:44 -08:00
Andy Rothfusz 9af351f520 Merge pull request #3248 from lsm5/docker-fedora-conflict 
Docker fedora conflict
Upstream-commit: 2deb0c3365a5d0f8825c7fd2139f3a6cdcba2016
Component: engine
 2013-12-17 11:01:37 -08:00
Andy Rothfusz ab2b80c344 Merge pull request #3221 from jamtur01/introlink 
Updated Introduction link
Upstream-commit: 391676b59875ef08e3f42bd4a80fde9b5c100f32
Component: engine
 2013-12-17 10:36:00 -08:00
Andy Rothfusz ffe3e370f1 Merge pull request #3213 from metalivedev/1695-dockerlogs 
Add more information about Docker logging
Upstream-commit: 906b481148d8355f3cab2271d55ecf64d2d46102
Component: engine
 2013-12-13 14:29:14 -08:00
Andy Rothfusz a0d092fa16 Fix #1695 by adding more about logging. 
Upstream-commit: 1e85aabf710b2bc8d47027973fe19f4f10a5ba1e
Component: engine
 2013-12-13 11:42:58 -08:00
Andy Rothfusz 6c5256e4e3 Merge pull request #3190 from zain/master 
Small typo fixes
Upstream-commit: 2d1f61ef0ec93539fd55f27cbd6f08ef0f0f33d2
Component: engine
 2013-12-12 11:25:11 -08:00
Andy Rothfusz b89adb4dee Merge pull request #3189 from aknikitin/patch-1 
Minor spelling fix
Upstream-commit: 54df95f26c8fcb9bf4f90974e98188f4142e82b4
Component: engine
 2013-12-12 11:24:45 -08:00
Andy Rothfusz b0f69a4755 Merge pull request #3181 from lsm5/rhel-docs-typos 
Rhel docs typos
Upstream-commit: b722f809e751dd33371c46e3fe63c63aea405724
Component: engine
 2013-12-11 16:37:24 -08:00
Andy Rothfusz a47c0933c1 Merge pull request #3177 from tianon/fix-turnbull-github 
Fix James's github handle in docs/MAINTAINERS
Upstream-commit: 4eda2a54de9d1033d5be4925ae4aa6fb3b4508d9
Component: engine
 2013-12-11 16:00:06 -08:00
Andy Rothfusz b20c07a32a Merge pull request #3176 from lsm5/rhel-docs 
Rhel docs
Upstream-commit: d3292078dc501b8afc94c87554184789757586e7
Component: engine
 2013-12-11 15:58:42 -08:00
Andy Rothfusz 1f4103a07d Merge pull request #3174 from richo/features/https_install_script 
Use https to get the install script
Upstream-commit: d56d8ab96eff194619624a5b09749ebb960743ad
Component: engine
 2013-12-11 14:09:22 -08:00
Andy Rothfusz ef604cf7d9 Merge pull request #3161 from SvenDowideit/make-replace-docker-binary-note-more-obvious 
associate swapping the built docker binary with building the binary, rather than a note in building the docs
Upstream-commit: 6cf8ec606ee6826c65efe4275cd819002bacb9a5
Component: engine
 2013-12-11 14:04:34 -08:00
Andy Rothfusz 851d8d4fe9 Merge pull request #3167 from qbrossard/patch-1 
Corrected typo (resdis -> redis)
Upstream-commit: 11b3fbb3bdedfeb65ae002a6feaa336a7a8c7c5b
Component: engine
 2013-12-11 13:57:59 -08:00
Andy Rothfusz 562bdffce3 Merge pull request #3165 from SvenDowideit/cmd-rmi-example 
add example for docker rmi, and explain the need to remove all references (tags) to and image before its garbage collected :)
Upstream-commit: 036f41fde395d0f567b08996836aeb7e217729f3
Component: engine
 2013-12-11 13:57:13 -08:00
Andy Rothfusz 958e22180f Merge pull request #3162 from SvenDowideit/docker-commit-example-change-CMD 
add a direct example for changing the cmd that is run
Upstream-commit: 6e9c1590c6f992d76aa507233f059fc0d5d5bf4d
Component: engine
 2013-12-11 13:52:12 -08:00
Andy Rothfusz 1e4a06b36d Merge pull request #3159 from SvenDowideit/make-docs-consistency 
Makefile: make docs is more consistent
Upstream-commit: fb9ddc5de5477a88c236963e5ac4dc6f054115ff
Component: engine
 2013-12-10 16:51:35 -08:00
Andy Rothfusz cdb25c470c Merge pull request #3103 from metalivedev/1229-titleactions 
Update "Use" titles to be action-oriented
Upstream-commit: 8814c11b140fbcda266c5168340431044f59aa30
Component: engine
 2013-12-09 18:57:48 -08:00
Andy Rothfusz 1bde8bd6e1 Fix #1229. Update titles, fix some wrapping. 
Make the Ambassador container explicit.
Apply Sven's suggestions.
Upstream-commit: 9c1e9a5157b3ef7627f4b735c2b8b6d97f26dd53
Component: engine
 2013-12-09 17:23:56 -08:00
Andy Rothfusz e09eb89d48 Merge pull request #3146 from jamtur01/linkedits 
Some minor cleanup of the Links use document
Upstream-commit: 0b0b0ca0f915bcbe79923b313fb45be6253d8ade
Component: engine
 2013-12-09 17:09:59 -08:00
Andy Rothfusz 86975238fd Merge pull request #3109 from artagnon/arch-install 
Update Arch installation doc
Upstream-commit: b7bc80cba90ecfe75cd621f3d437e63e3ec3fd5d
Component: engine
 2013-12-09 15:52:54 -08:00
Andy Rothfusz 6865b89ad2 Merge pull request #3104 from jamtur01/uses 
Added section on Trusted Builds
Upstream-commit: 864729b96fbf3fa912d2686df79ec9baf15af856
Component: engine
 2013-12-09 15:51:52 -08:00
Andy Rothfusz 009a1fe4fc Merge pull request #3143 from idupree/patch-1 
Make it extra clear that the `docker` group is root-equivalent.
Upstream-commit: a67571668e7b95fc21c0a5dea1eccc83af3db7f6
Component: engine
 2013-12-09 15:48:05 -08:00
Andy Rothfusz a30df829ac Merge pull request #3030 from jamtur01/versions 
Fixed #2136 - Added styles
Upstream-commit: 07f7643bbc98dd43dd073a128c33495d55b099d4
Component: engine
 2013-12-06 14:27:53 -08:00
Andy Rothfusz 6ca0e7d37f Merge pull request #3094 from tang0th/patch-1 
Update archlinux.rst as packages have changed
Upstream-commit: 6fa1463614b810d725763a20aec1fb4b8c4d1c22
Component: engine
 2013-12-06 14:18:31 -08:00
Andy Rothfusz bd0ac498d1 Merge pull request #3088 from SvenDowideit/start-cmdline-examples-with-dollar-for-easier-testing 
change the policy wrt $ sudo docker to simplify auto-testing
Upstream-commit: 7fd64e0196fec3a3a30c6d3359989e1f83074207
Component: engine
 2013-12-06 13:37:02 -08:00
Andy Rothfusz f1753d066b Merge pull request #3071 from lsm5/fedora-docs-update 
use mattdm/fedora in fedora doc and other cosmetic changes
Upstream-commit: d75fc6e529a4a7279829f4229c474adf29514b8b
Component: engine
 2013-12-06 11:25:10 -08:00
Andy Rothfusz f296451534 Merge pull request #3052 from shawnl/patch-1 
nftables dependancies in kernel
Upstream-commit: 4a148919c3c988f3ade8c4564c65de7f9816c15b
Component: engine
 2013-12-06 11:02:49 -08:00
Andy Rothfusz 86392dd452 Merge pull request #3086 from metalivedev/3045-addmirrors 
Add debian mirrors. Fixes #3045.
Upstream-commit: 5f5949f6a695cd0e80275d95872580ededa46a81
Component: engine
 2013-12-05 18:16:28 -08:00
Andy Rothfusz 6671f362c6 Add debian mirrors. Fixes #3045. 
Upstream-commit: 58b75f8f29b5fff388ec3d8d84249e122462c137
Component: engine
 2013-12-05 18:08:56 -08:00
Andy Rothfusz 900b5e498f Merge pull request #3069 from proppy/patch-1 
docs/installation/google: add enabling Google Compute Engine step
Upstream-commit: f9147effac69e9746b6aae5af9d37bf437aa6c2d
Component: engine
 2013-12-05 17:40:42 -08:00
Andy Rothfusz 1a871cfdd1 Merge pull request #3001 from dotcloud/api_json 
add docs for the new json format
Upstream-commit: 0e2b0f284c1acfbb152ccca77417b4e132a4355b
Component: engine
 2013-12-05 17:35:51 -08:00
Andy Rothfusz 5115cf8685 Merge pull request #3051 from pariviere/2490-docs-network 
Network documentation page
Upstream-commit: 80dfa23da8359618a2453cb1cb3cb5fa69bb71f8
Component: engine
 2013-12-05 17:29:54 -08:00
Andy Rothfusz fec117a06e Clean up quoting, wraps, and build error on code-block. 
Upstream-commit: 4bea68dfa6a9c68232ff7a5c36c85fc827dae938
Component: engine
 2013-12-05 17:16:31 -08:00
Andy Rothfusz 41a5e644a5 Merge branch 'docker-run-prose-2149' of github.com:SvenDowideit/docker into 3036-test 
Upstream-commit: ea0ed9a9159de98c444c6a83649ae2eb51da1c84
Component: engine
 2013-12-05 17:03:26 -08:00
Andy Rothfusz dd568b3dd1 Merge pull request #3065 from SvenDowideit/use-makefile-in-devenv-documentation 
use the Makefile in the dev environment documentation - its way less typing, and fewer typing mistakes
Upstream-commit: 81b25fde7998cb9f5720844e5d487f73c7942d07
Component: engine
 2013-12-05 15:27:36 -08:00
Andy Rothfusz 8a00a3de0b Merge pull request #3062 from SvenDowideit/cli-examples-dollar-sudo-docker 
Some examples didnt use $ sudo docker, so this makes it a little more consistent
Upstream-commit: 0189a994715f0ca141c7af289ede6d553c12b78e
Component: engine
 2013-12-05 15:25:09 -08:00
Andy Rothfusz c8f60ad629 Merge pull request #3061 from shykes/sven-doc-maintainers 
Add Sven Dowideit to docs maintainers
Upstream-commit: 9320f4e2d1caf0b3d84388808c23767543987fd0
Component: engine
 2013-12-05 15:17:34 -08:00
Andy Rothfusz f9d6ff33ee include Red Hat Enterprise, should have part of #3011 
oops, forgot the index!
Upstream-commit: a96bf7439774d905f72e835218c72a5b45da37c0
Component: engine
 2013-12-05 14:34:10 -08:00
Andy Rothfusz 89905dc61d Merge pull request #3011 from goldmann/rhel_instructions 
Instructions on how to install Docker on Red Hat Enterprise Linux / CentOS
Upstream-commit: cc0466bb685ad9c393e282860734282659a4b409
Component: engine
 2013-12-05 14:30:31 -08:00
Andy Rothfusz 8592a6729a Merge pull request #3034 from rogaha/fix_doc_registry_index_spec 
- Updated the doc according to the current implementation status
Upstream-commit: 0a7e0f081958e3b12ad7941ace04af0fb5ef675b
Component: engine
 2013-12-05 14:24:13 -08:00
Andy Rothfusz 754f4c422f Merge pull request #3010 from SvenDowideit/origin/docker-ps-linked-container-alias-example 
add an example of docker ps, and also of link aliases
Upstream-commit: e3c3f3c324e37536cc582f91b8963ba10d337417
Component: engine
 2013-12-05 14:00:53 -08:00
Andy Rothfusz 370b2a74f3 Merge pull request #3038 from SvenDowideit/2485-ambassador-pattern-doc 
initial stab at writing a use/ambassador-pattern howto
Upstream-commit: e304e8936b4f23c875dfe18e07763642cdf73a64
Component: engine
 2013-12-05 11:01:27 -08:00
Andy Rothfusz 25e3f85d24 Merge pull request #2991 from fortybillion/patch-1 
API documentation: added format of Volumes and Binds parameters to "create" and "start" 
Upstream-commit: 94d46a8d3a2278962c30c01e831754d6cefe9b2e
Component: engine
 2013-12-04 18:32:19 -08:00