Commit graph

4289 commits

Author SHA1 Message Date
David Calavera
9a7e632cf0 Update inspect api examples with new network settings.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-10-27 19:56:29 -04:00
Sebastiaan van Stijn
b96e076af9 Merge pull request #16017 from flowlo/master
docs: Explain volume_name in POST /container Binds
2015-10-27 23:28:47 +01:00
David Calavera
1156b7ff66 Merge pull request #17401 from hugomarisco/patch-1
update gpg add key command, without sudo it fails
2015-10-27 15:16:27 -07:00
Mary Anthony
d5364c7114 Updating network commands: adding man pages
Adding Related information blocks
Final first draft pass: ready for review
Review comments
Entering comments from the gang
Updating connect to include paused

Signed-off-by: Mary Anthony <mary@docker.com>
2015-10-27 08:29:07 -07:00
Hugo Marisco
7f7953dcc2 update gpg add key command, without sudo it fails
Signed-off-by: Hugo Marisco <0x6875676f@gmail.com>
2015-10-27 13:49:52 +00:00
Kun Zhang
9b0d0a64fa command missing 'daemon'
Signed-off-by: Kun Zhang <zkazure@gmail.com>
2015-10-27 16:22:09 +08:00
Mary Anthony
5560e8a61c Tweaking some things
Signed-off-by: Mary Anthony <mary@docker.com>
2015-10-24 18:07:08 -07:00
Sebastiaan van Stijn
8d4888df90 Merge pull request #16488 from splunk/splunk_log_driver
Add Splunk logging driver #16207
2015-10-23 18:22:14 -07:00
Sebastiaan van Stijn
448398c2a8 Merge pull request #15780 from mountkin/build-multi-tags
Add ability to add multiple tags with docker build
2015-10-23 13:50:35 -07:00
Denis Gladkikh
1f1dbf312d Add Splunk logging driver #16207
Allow to send Splunk logs using Http Event Collector

Signed-off-by: Denis Gladkikh <denis@gladkikh.email>
2015-10-23 13:37:53 -07:00
Shijiang Wei
c2eb37f9ae Add ability to add multiple tags with docker build
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-10-24 00:59:56 +08:00
Sven Dowideit
1f9332cd16 Two more links to fix
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-10-23 14:10:43 +10:00
Tibor Vass
4c253ddf20 Merge pull request #17275 from vdemeester/17246-tags-to-repotags
Use RepoTags & RepoDigest in inspect
2015-10-22 17:14:49 -04:00
Vincent Demeester
f664f6e4b1 Use RepoTags & RepoDigest in inspect
To be coherent with /images/json (images command)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-22 23:00:59 +02:00
Sebastiaan van Stijn
bb19575d40 Merge pull request #17259 from SvenDowideit/fix-some-errant-links
Fix some errant links
2015-10-22 07:26:15 -07:00
Sven Dowideit
9ed6cec8ff Fix some errant links
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-10-22 20:33:24 +10:00
Sebastiaan van Stijn
c6ec33ea8f Merge pull request #17241 from gondor/docs-extend-plugins
docs: Add Netshare volume plugin to extend/plugins
2015-10-21 19:24:32 -07:00
Jeremy Unruh
a263709a9b changes from review - which -> that
Signed-off-by: Jeremy Unruh <jeremybunruh@gmail.com>
2015-10-21 18:42:17 -07:00
Jeremy Unruh
f8c0d4d055 changes from review - move up to conform to alphabetical order
Signed-off-by: Jeremy Unruh <jeremybunruh@gmail.com>
2015-10-21 18:07:55 -07:00
Sebastiaan van Stijn
492945235b Merge pull request #17136 from gesellix/change-route-volume-create
rename `POST /volumes` to `POST /volumes/create`
2015-10-21 10:21:27 -07:00
Jeremy Unruh
95c053c56b docs: Add Netshare volume plugin to extend/plugins
Signed-off-by: Jeremy Unruh <jeremybunruh@gmail.com>
2015-10-21 08:28:37 -07:00
moxiegirl
e92a735d70 Merge pull request #17192 from HuKeping/docs-update
Docs: update docs for API stats
2015-10-20 06:15:58 -07:00
Hu Keping
969f1d9773 Docs: update docs for API stats
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-10-20 16:31:20 +08:00
Sven Dowideit
b826215c57 Merge pull request #16801 from aidanhs/aphs-add-socat-t
Update ambassador image, use the socat -t option
2015-10-20 14:24:25 +10:00
Brian Goff
8005dbd748 Merge pull request #17127 from gesellix/docs-filters-query
docs: fix description of `filters` param for /volumes and /networks.
2015-10-19 09:49:37 -04:00
ripcurld00d
6a64865991 Update fedora doc
`service` is deprecated from Fedora v21.
It's important to enable and start the `docker` daemon using `systemctl`.

Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
2015-10-18 23:00:23 +03:00
Sebastiaan van Stijn
8f36ded5b1 docs: fix storage driver options list
This fixes the indentation of the storage driver
options list.

Also wraps/reformats some examples to prevent
horizontal scrollbars on the rendered HTML

Fixes #17140

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-10-17 19:17:07 -07:00
Tobias Gesellchen
0c95eeb584 rename POST /volumes to POST /volumes/create to be consistent with the other POST /.../create endpoints
see #17132

Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
2015-10-17 14:13:40 +02:00
Antonio Murdaca
ab1f03397e Merge pull request #17119 from vdemeester/17117-deprecate-c-cli-opts
Deprecate -c cli short variant flag in docker cli build & create
2015-10-17 10:22:46 +02:00
Tobias Gesellchen
3e064371e7 docs: fix description of filters param for /volumes and /networks.
fixes #17091

Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
2015-10-17 00:24:40 +02:00
David Calavera
475be776b8 Merge pull request #17051 from thaJeztah/fix-volume-readonly-doc
remove incorrect "readonly" example
2015-10-16 15:11:48 -07:00
Vincent Demeester
d1064bd441 Deprecate -c cli short variant flag in docker cli
- build
- create

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-17 00:05:34 +02:00
Sebastiaan van Stijn
e2870bda43 Merge pull request #17085 from dnephin/add_digest_to_api_docs
Correct API docs for /images/create
2015-10-16 10:10:41 -07:00
Mary Anthony
ee30af5ffb bad d
Signed-off-by: Mary Anthony <mary@docker.com>
2015-10-16 06:09:03 -07:00
Mary Anthony
e44876bf1f Removing extra tic
Signed-off-by: Mary Anthony <mary@docker.com>
2015-10-16 06:07:52 -07:00
Daniel Nephin
2ec4404ba0 Correct API docs for /images/create
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-15 16:00:05 -04:00
David Calavera
f255155f6b Merge pull request #17057 from mavenugo/nls
Added `network` to docker --help and help cleanup
2015-10-15 11:00:43 -07:00
Arnaud Porterie
9216b08536 Merge pull request #16998 from vieux/engine_version
only display 'Engine Version' when it's not empty
2015-10-15 08:43:32 -07:00
Aidan Hobson Sayers
ac9c0f81df Remove references to the docker-ut image
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
2015-10-15 15:02:26 +01:00
Madhu Venugopal
46f7ab3585 Added network to docker --help and help cleanup
Fixes https://github.com/docker/docker/issues/16909

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-15 03:10:39 -07:00
Sebastiaan van Stijn
244d9c3370 remove incorrect "readonly" example
The :ro option can only be used for named and bind-mounted
volumes, not on "regular" (unnamed) volumes as explained in
https://github.com/docker/docker/pull/16013#issuecomment-146647216

The example in the documentation actually resulted in a
bind-mounted volume, mounted at "ro" inside the container.

This removes the incorrect example from the documentation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-10-14 17:56:38 -07:00
Victor Vieux
17b0017cd0 use Server Version
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-14 17:46:59 -07:00
Sebastiaan van Stijn
2b4128e904 Merge pull request #16617 from zhangjianfnst/15869-improve-commandline-doc
Improve the way we deliver Examples in command line.
2015-10-14 11:05:27 -07:00
Jian Zhang
cc653b5d61 Improve the way we deliver Examples in command line. (Add descriptive titles)
Signed-off-by: Jian Zhang <zhangjian.fnst@cn.fujitsu.com>
2015-10-14 11:04:51 +08:00
Tibor Vass
22a0ea5550 Bump API Version to v1.22
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-10-13 17:27:33 -07:00
Vincent Demeester
ce607916e9 Merge pull request #15796 from azurezk/add-size-to-inspect
add container size info to inspect
2015-10-13 23:16:10 +02:00
moxiegirl
9be87c9a96 Merge pull request #16965 from mikebrow/docs-improvement-for-expose-16634
updating docs for EXPOSE option on run command
2015-10-13 11:33:28 -07:00
moxiegirl
9ead1663c3 Merge pull request #16946 from pwnall/cpu_quota_docs
Document CFS CPU period / quota support in the API
2015-10-13 10:51:48 -07:00
Mary Anthony
39a71acf7e Centralize discussion of behavior label and env.
Signed-off-by: Mary Anthony <mary@docker.com>
2015-10-13 09:44:17 -07:00
Sebastiaan van Stijn
3856c5efa6 Merge pull request #16961 from vdemeester/pr-15975-carry-for-docs
Carry #15975 - Add extra fields based on label and env for gelf/fluentd/json-file/journald log drivers
2015-10-13 09:30:32 -07:00