599a6cd34c
fix(cli.rst): add missing underscores
...
As suggested by @metalivedev
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
Upstream-commit: 2fe7588af79bbc61e758ff066be1cf1c2d381f7b
Component: engine
2014-01-27 17:18:09 -08:00
7f4461fb98
Allow fd:// like unix:// and tcp://
...
Somthing like 20605eb310f0b57bd06eea80ec63c5022fc83bde
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
Upstream-commit: 7f9d3268bf0e1d4a79d07c67e22eb14d3de96f6c
Component: engine
2014-01-27 17:18:09 -08:00
5197c3fef9
fix(docs): add Systemd in front of socket activation
...
Suggested by SvenDowideit.
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
Upstream-commit: 6acc99889d97638d632a2974e04cd91ed4036c4b
Component: engine
2014-01-27 17:18:09 -08:00
efeecbbbfb
docs: improve the socket activation cli docs
...
as suggested by SvenDowideit expand the docs to have more information on
socket activation.
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
Upstream-commit: 4a90f00ab7ec9e534c97611dbbdc412ed5966602
Component: engine
2014-01-27 17:18:09 -08:00
bbf27c35bb
fix(docs): fixup based on changes in master
...
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
Upstream-commit: cfeb1f0f652e11b8b6a8b4e1cbed3835fc5d9546
Component: engine
2014-01-27 17:18:09 -08:00
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
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
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
b231028354
Update puppet.rst
...
Upstream-commit: 551e1a766c8aaec190972e3542fd8a1c7452b6b2
Component: engine
2014-01-27 18:21:48 +03:00
11aa2d4639
Clean up grammar on puppet.rst
...
Upstream-commit: 03d9984f177ec1d093011bcf3693338dabecc19e
Component: engine
2014-01-27 15:13:17 +03:00
47410e7905
Use exec to replace bash with apache2 after environment is set up
...
Docker-DCO-1.1-Signed-off-by: Mike Naberezny <mike@naberezny.com > (github: mnaberez)
Upstream-commit: 2ba2a8ae40b83ac1cc0c4a60724073fa8255b257
Component: engine
2014-01-26 11:53:22 -08:00
5d3cc5f71c
move image name into correct position
...
Docker-DCO-1.1-Signed-off-by: Aaron Feng <aaron.feng@gmail.com > (github: aaronfeng)
Upstream-commit: 31e59580092bd4f144bf512e2fd13dcba426b02a
Component: engine
2014-01-26 08:11:30 -05:00
0badcc35ea
Fix TOC for Articles
...
Upstream-commit: 6cae33ca0f78ce8b7f1250e1f85828cfb242b12f
Component: engine
2014-01-23 18:55:26 -08:00
9f4a307e6f
talk about the new exec form of RUN ( Closes #3723 ) implemented by #3558
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: bfc1043f36dcce7f6232be55148f52327e356933
Component: engine
2014-01-23 14:00:16 +10:00
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
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
6e009b9cf4
move the contributing hook into hack, and use curl in the same way as the gofmt above
...
and remove the fmt-check one we don't document
tianon tells me they're called GitHub, not Github :)
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 7c55cbd4c9da88ffb4b1a325ba2e5435e337a3af
Component: engine
2014-01-22 21:31:42 +10:00
9cba35e523
change the documentation only - It looks like we have a number of cmdline params to completely update from the code version
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 0f5ad430c4a37f6efe7f27428ba54cf719936b68
Component: engine
2014-01-22 21:29:05 +10:00
3f862551be
Wording improvements
...
Docker-DCO-1.1-Signed-off-by: John Gardiner Myers <jgmyers@proofpoint.com > (github: johngmyers)
Upstream-commit: 1c06a9196451a595c71a47ba9fb4e9f4bc270746
Component: engine
2014-01-21 22:40:33 -08:00
d09055ce5a
Grammar and punctuation fixes
...
Docker-DCO-1.1-Signed-off-by: John Gardiner Myers <jgmyers@proofpoint.com > (github: johngmyers)
Upstream-commit: f3cb808e9d7d870dc71510bdeecec15745bb44b5
Component: engine
2014-01-21 22:40:06 -08:00
04f201ccfb
Add a --signal option to the kill command to specify a signal.
...
Docker-DCO-1.1-Signed-off-by: Paul Lietar <paul@lietar.net > (github: plietar)
Upstream-commit: 1f75a0bf435fe9a0f118b027e0387ba41e201c66
Component: engine
2014-01-22 06:10:52 +00:00
054751d110
Documentation about automatic bind-mount dir creation
...
Docker-DCO-1.1-Signed-off-by: Maxime Petazzoni <max@signalfuse.com > (github: mpetazzoni)
Upstream-commit: 47d1413d7a0850edc64c62f1473b4c4a3f417d7c
Component: engine
2014-01-21 16:05:30 -08:00
2a860faf85
switch back to the valid json format
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: e3461bc8d694fa4b104a9cdd08e11de26a04d923
Component: engine
2014-01-21 15:06:23 -08:00
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
1b8b44e502
Merge pull request #3690 from shykes/cleanup-maintainers
...
Cleanup maintainers
Upstream-commit: ba4ae40445d40545a83b5dc9040c1c4942bb51ce
Component: engine
2014-01-21 11:18:23 -08:00
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
0d4fdafaa4
Fixed commandline/index warning in TOC
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: fabf96b8ff5560523d60269d0052b65037394dcc
Component: engine
2014-01-21 08:22:51 -05:00
7cb035c53d
docs: harmonize intro paragraph with website
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: fdf43f5de14e1ddf9e806e78f51e98721b920b5d
Component: engine
2014-01-21 07:33:26 +00:00
f0d14c9de1
Docs: fix capitalization of "Docker"
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: ae2af201f340420f70ca05d54d150764bd88e680
Component: engine
2014-01-21 07:27:55 +00:00
3b8064670d
Docs: move advanced topic "create your own base image" out of basic user guide
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: c24d128bb545e292ffb0790d8ad3652f56d62b44
Component: engine
2014-01-21 03:43:16 +00:00
5aafcb2d29
docs: "first steps with docker" is a better title than "learn basic commands"
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 589e1a9bdce47d87870c64c5449002bca2b315a4
Component: engine
2014-01-21 03:43:16 +00:00
61cb59e7c7
docs: add standard 'check your docker install' paragraph to the 'hello world' examples.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 76eee50a67732ee18a678ebf54720b78370254df
Component: engine
2014-01-21 03:43:16 +00:00
f8b7a24843
docs: move a sysadmin-focused topic out of the basic usage manual and into installation docs (setting up a user group for non-root access)
...
docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: cf5504eed50f01797646079ab849260ec16cd5a2
Component: engine
2014-01-21 03:43:16 +00:00
3c8e9b6ca8
docs: simplify basic usage doc, step 1: check your docker install
...
docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: cf1781608326e9e3ce090383259bbc26d43c49d6
Component: engine
2014-01-21 03:43:16 +00:00
cbf7c3189e
Remove myself as sole maintainer of api reference docs.
...
Please still ping me before changing APIs :)
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 1fe426641d30b5cde4adc826b3112468a4b10559
Component: engine
2014-01-20 18:49:13 -08:00
e4c7dc13cd
Remove Ken from docs maintainers (he's busy on other things)
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 230554695ad083048268cbf0fd1364cabdaddce8
Component: engine
2014-01-20 18:48:59 -08:00
1f774297a3
Reordering to make FAQ last
...
Upstream-commit: 90b52b7e0623271ec0351ffb6dc7a7586bbe6e4d
Component: engine
2014-01-20 17:11:03 -08:00
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
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
145ef0e1f4
Fix support for registry auth with Dockerfile build.
...
Docker-DCO-1.1-Signed-off-by: Jake Moshenko <jake@devtable.com > (github: jakedt)
Upstream-commit: 6e6ff85362dfa823c392392cb9e70d620e308911
Component: engine
2014-01-20 18:35:14 -05:00
28daf949e1
docs: reuse official dependencies list from packager's guide for custom binary install docs
...
Upstream-commit: 45e8d1f4c0366c5372229db20b95b70badc92119
Component: engine
2014-01-20 23:17:40 +00:00
aec4036475
docs: remove out-of-date kernel requirements document.
...
Requirements differ from platform to platform depending on the plugins used, and so should be documented separately for each target platform
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 4e54dd245a5e20b86f305ccb8f493d7f17317c50
Component: engine
2014-01-20 23:11:30 +00:00
d1c858864a
docs: instead of a top-level 'upgrading docker' doc, add an 'upgrades' paragraph to each installation target
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: dd786eefbbf286ca57b52374a6905c1ac8b8bd60
Component: engine
2014-01-20 23:11:30 +00:00
07e461cf30
docs: change topic of windows install docs to 'install docker on windows'
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 29e6868cc36356393730ff2a5ae4506ac2d162e1
Component: engine
2014-01-20 23:11:30 +00:00
61d0a6b6c9
docs: move 'vagrant' install docs to the more accurate 'mac' install docs
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: c56e3b8569caa8db6fb7372c7a5f5153eb5d63b7
Component: engine
2014-01-20 23:11:30 +00:00
19a30043af
docs: move security article to a new 'articles' section
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: d8a71635d4eb6b3dbe0102ab6e177bff8ff5dbec
Component: engine
2014-01-20 23:11:30 +00:00
1c3b8811ea
Fix Travis build errors by bumping our python module versions to be newer
...
See also https://bitbucket.org/birkenfeld/sphinx/issue/1281/sphinx-113-not-build-proper-manpages
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 6ed9b06e072888d1e7bd60106f17371a89b668a4
Component: engine
2014-01-20 12:30:18 -07:00
cafba118e5
Add Dockerfile man page generation from our Dockerfile reference page
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 1c152f443df254e18d44790cd0dbfb6f6361e018
Component: engine
2014-01-20 11:29:07 -07:00
03deebf0c1
Fix docs manpage generation
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 10fc518fba8bf0f4a32cb1824664abfbacf5d884
Component: engine
2014-01-20 11:29:07 -07:00
98435ab7c4
Switch docker run --username to docker run --user which is more accurate (while we can still do so without breaking anyone's scripts)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: fb981bdace66e5b34d41125beb16e450998fd1e7
Component: engine
2014-01-20 00:28:55 -07:00
