d2382f7b96
Remove old api docs that are no-longer appearing on docs-docker.com
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-11-01 08:22:10 -08:00
e4d86c2c38
Update to hide the 1.10 material
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-11-01 08:03:08 -08:00
5ce093e945
Fixing broken links
...
Fixing the weight
Signed-off-by: Mary Anthony <mary@docker.com>
2015-10-31 19:45:56 -07:00
f714118439
Merge pull request #17447 from ehaydenr/master
...
Update kill.md
2015-10-30 10:07:44 -07:00
c545dce004
Merge pull request #16640 from samuelkarp/awslogs-logging-driver
...
[awslogs] Auto-detect region and set user-agent
2015-10-30 12:38:40 -04:00
c1a5ee53c1
Update kill.md
...
Added Note to show users that signals will not propagate to the container if the preferred exec form isn't used.
Signed-off-by: Eric Rosenberg <ehaydenr@gmail.com>
2015-10-29 18:40:16 -05:00
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
8a6dfb26f3
[awslogs] Auto-detect region on EC2 instances
...
Signed-off-by: Samuel Karp <skarp@amazon.com>
2015-10-27 23:47:28 +00:00
b96e076af9
Merge pull request #16017 from flowlo/master
...
docs: Explain volume_name in POST /container Binds
2015-10-27 23:28:47 +01:00
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
9b0d0a64fa
command missing 'daemon'
...
Signed-off-by: Kun Zhang <zkazure@gmail.com>
2015-10-27 16:22:09 +08:00
8d4888df90
Merge pull request #16488 from splunk/splunk_log_driver
...
Add Splunk logging driver #16207
2015-10-23 18:22:14 -07:00
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
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
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
4c253ddf20
Merge pull request #17275 from vdemeester/17246-tags-to-repotags
...
Use RepoTags & RepoDigest in inspect
2015-10-22 17:14:49 -04:00
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
bb19575d40
Merge pull request #17259 from SvenDowideit/fix-some-errant-links
...
Fix some errant links
2015-10-22 07:26:15 -07:00
9ed6cec8ff
Fix some errant links
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-10-22 20:33:24 +10:00
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
e92a735d70
Merge pull request #17192 from HuKeping/docs-update
...
Docs: update docs for API stats
2015-10-20 06:15:58 -07:00
969f1d9773
Docs: update docs for API stats
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-10-20 16:31:20 +08:00
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
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
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
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
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
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
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
ee30af5ffb
bad d
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-10-16 06:09:03 -07:00
e44876bf1f
Removing extra tic
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-10-16 06:07:52 -07:00
2ec4404ba0
Correct API docs for /images/create
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-15 16:00:05 -04:00
f255155f6b
Merge pull request #17057 from mavenugo/nls
...
Added `network` to docker --help and help cleanup
2015-10-15 11:00:43 -07:00
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
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
17b0017cd0
use Server Version
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-14 17:46:59 -07:00
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
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
22a0ea5550
Bump API Version to v1.22
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-10-13 17:27:33 -07:00
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
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
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
39a71acf7e
Centralize discussion of behavior label and env.
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-10-13 09:44:17 -07:00
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
d955fdb9ac
updating docs for EXPOSE option on run command; fixes #16634
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2015-10-13 10:43:27 -05:00
cd426ebed7
Add docs for label/env log-opts
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-13 08:39:47 +02:00
df79536769
Merge pull request #16009 from azurezk/vol-create-conflict-option
...
volume create error on conflict option
2015-10-12 15:27:36 -07:00
dc500630ec
Merge pull request #16942 from physicalit/master
...
Add CMD and EXPOSE instruction example
2015-10-12 15:26:30 -07:00
26bd356078
Document CFS CPU period / quota support in the API.
...
Docker 1.7 got support for specifying the CFS scheduler's CPU quota and
period. The work appears to have started around commit
dcc50e1d59
2015-10-12 11:26:39 -04:00
ab83cf37c9
Document updates for cluster-store-opt
...
This updates the docs for the daemon based on the new cluster-store-opt
for TLS support.
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
2015-10-12 08:05:02 -07:00
fad2cc6a18
Add CMD and EXPOSE instruction example
...
Signed-off-by: Mihuleacc Sergiu <mihuleac.sergiu@gmail.com>
2015-10-12 17:30:47 +03:00
0ff3123eba
volume create error on conflict option
...
Signed-off-by: Kun Zhang <zkazure@gmail.com>
2015-10-12 11:16:39 +08:00
c45ad0b02d
Merge pull request #15753 from SvenDowideit/make-windows-default-to-use-2376
...
Default the tcp port to 2376 if tls is on, and 2375 if not
2015-10-11 15:35:04 -07:00
70edf41c06
Merge pull request #16764 from thaJeztah/follow-the-white-rabbit
...
Docs: add Docker version/API version matrix
2015-10-11 15:28:46 -07:00
8fee1c2020
Enabled GitHub Flavored Markdown
...
GitHub flavored markdown is now supported for links and images. Also, ran LinkChecker and FileResolver. Yay!
Fixes from Spider check
Output for docker/docker now goes into engine directory
Signed-off-by: Mary Anthony <mary@docker.com>
2015-10-11 07:49:54 -07:00
b4d6b23838
add size to inspect
...
Signed-off-by: Zhang Kun <zkazure@gmail.com>
2015-10-10 20:44:29 +08:00
50f0906007
Default the tcp port to 2376 if tls is on, and 2375 if not
...
Refactor so that the Host flag validation doesn't destroy the user's input,
and then post process the flags when we know the TLS options
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-10-09 17:48:03 -07:00
dbc20693f7
Merge pull request #16604 from mountkin/add-missing-commit-parameters
...
add missing parameters of the commit API to the docs
2015-10-09 20:55:54 +02:00
26ee5fea02
Merge pull request #16287 from mikebrow/16055-man-update-for-docker-run-with-host-volumes
...
man update for docker run with host volumes
2015-10-09 09:24:11 -07:00
b69f4f3c13
add missing parameters of the commit API to the docs
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-10-09 23:21:12 +08:00
06146b333c
Merge pull request #16876 from luca3m/patch-1
...
Sync with remote API
2015-10-09 06:30:02 -07:00
734c9d2f67
Merge pull request #16833 from sunyuan3/cpu-shares
...
Add description for "--cpu-shares=0".
2015-10-09 06:29:18 -07:00
d7ca0a48ac
Sync with remote API
...
Signed-off-by: Luca Marturana <lucamarturana@gmail.com>
Sync also container events
Signed-off-by: Luca Marturana <lucamarturana@gmail.com>
Sync also man page
Signed-off-by: Luca Marturana <lucamarturana@gmail.com>
2015-10-09 13:53:51 +02:00
2bd2893b92
docs: Explain volume_name in POST /container Binds
...
Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
2015-10-09 11:32:11 +02:00
458ec418cd
Add more cgroup config to docker info
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-10-09 03:02:04 -04:00
b50a88cfd7
Merge pull request #16644 from dhiltgen/discovery_tls
...
Add TLS support for discovery backend
2015-10-08 14:21:06 -07:00
246072e8c5
Merge pull request #16837 from x1022as/network
...
update dockernetwork.md and network api
2015-10-08 12:27:49 -07:00
b44ef2b306
Fixing issues in command ordering. Adding index.md
...
Adjust bullets
Entering Seb's comments
Signed-off-by: Mary Anthony <mary@docker.com>
2015-10-08 09:28:46 -07:00
a4eba15b75
Merge pull request #16828 from jwayong/jwayong/docs
...
Docs: Add docker-elements to remote API client lib doc page
2015-10-08 10:05:44 -04:00
df6cd114a0
Merge pull request #15265 from greaber/dockerignore-docs
...
Further clarifications to .dockerignore docs
2015-10-08 06:24:44 -07:00
54f98f40a4
update dockernetwork.md and network api
...
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
2015-10-08 15:34:24 +08:00
b7249569e2
Add description for "--cpu-shares=0".
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-10-08 10:50:55 +08:00
124792a871
Add TLS support for discovery backend
...
This leverages recent additions to libkv enabling client
authentication via TLS so the discovery back-end can be locked
down with mutual TLS. Example usage:
docker daemon [other args] \
--cluster-advertise 192.168.122.168:2376 \
--cluster-store etcd://192.168.122.168:2379 \
--cluster-store-opt kv.cacertfile=/path/to/ca.pem \
--cluster-store-opt kv.certfile=/path/to/cert.pem \
--cluster-store-opt kv.keyfile=/path/to/key.pem
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
2015-10-07 16:01:00 -07:00
96ad26a730
Docs: Add docker-elements to remote API client lib doc page
...
This closes #16824
Signed-off-by: Januar Wayong <januar@gmail.com>
2015-10-08 08:45:35 +11:00
899ecc11c5
clarify dockerignore semantics
...
Signed-off-by: Grant Reaber <grant.reaber@gmail.com>
2015-10-07 15:51:57 -05:00
4c1540c8d2
Merge pull request #16806 from aidanhs/aphs-split-docs-dockerfiles
...
Don't put dockerfiles in one continuous code block
2015-10-07 13:40:19 -07:00
8e31036816
Merge pull request #16645 from mavenugo/ux
...
Docker Network UX & remote API changes
2015-10-07 10:44:58 -07:00
a1c373197f
Merge pull request #16807 from jfrazelle/rename-flag
...
change flag name to better follow the other flags that start with disable
2015-10-07 10:40:32 -07:00
c559d8ebf7
change flag name to better follow the other flags that start with disable;
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-07 10:16:37 -07:00
dd28ded711
Networking API and UX documentation
...
More doc updates will follow
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-07 03:54:27 -07:00
4cb0790a62
Mention more realistic examples are available
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
2015-10-07 11:45:57 +01:00
6a1a192e07
Don't put dockerfiles in one continuous code block
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
2015-10-06 22:58:42 +01:00
51e059e7e9
devmapper: Provide option to enabled deferred device deletion
...
Provide a command line option dm.use_deferred_deletion to enable deferred
device deletion feature. By default feature will be turned off.
Not sure if there is much value in deferred deletion being turned on
without deferred removal being turned on. So for now, this feature can
be enabled only if deferred removal is on.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
2015-10-06 17:37:21 -04:00
f9a1c8fc64
Update ambassador image, use the socat -t option
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
2015-10-06 13:42:06 +01:00
6a45bed9bf
Docs: add Docker version/API version matrix
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-10-06 01:04:15 +02:00
e1d3cb89f1
Merge pull request #16647 from vdemeester/revert-env-validation-docs
...
Update documentation on the revert on env validation
2015-10-05 15:27:45 -07:00
b3fe785c72
Update documentation on the revert on env validation
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-04 23:04:36 +02:00
67eb810a60
Merge pull request #16744 from runcom/fix-mam-commandline
...
Fix man and commandline docs
2015-10-04 22:28:19 +02:00
14e8898648
Fix man and commandline docs
...
- missing help option in `docs/reference/commandline/*.md` (some files
have it, the other I fixed didn't)
- missing `[OPTIONS]` in Usage description
- missing options
- formatting
- start/stop idempotence
Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
2015-10-04 21:22:27 +02:00
c1713e7c5a
Documentation for filtering events by label
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-02 16:45:08 -04:00
2d43d93410
Make exec start return proper error codes
...
Exec start was sending HTTP 500 for every error.
Fixed an error where pausing a container and then calling exec start
caused the daemon to freeze.
Updated API docs which incorrectly showed that a successful exec start
was an HTTP 201, in reality it is HTTP 200.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-10-02 14:40:22 -04:00
d6f8365258
Merge pull request #16680 from dnephin/update_list_image_api_docs
...
Update api docs for /images/json
2015-10-02 11:23:49 -07:00
3fcf481361
Fix docker ps truncate long image name by default
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-10-02 22:56:42 +08:00
85244f80e3
Merge pull request #16385 from RichardScothern/v1-deprecation
...
Add a daemon flag to prevent contact with v1 registries.
2015-09-30 10:10:06 -07:00
e5967d041d
Fix api documenation for /images/json response format
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-30 12:24:34 -04:00
4acf29a808
Command line, manpage and deprecation documentation.
...
Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
2015-09-28 10:31:04 -07:00
9324b154d2
Merge pull request #16229 from icecrime/discovery
...
Add builtin nodes discovery
2015-09-27 18:06:27 -07:00
486c12525f
Merge pull request #16109 from charleswhchan/patch-3
...
Touch up "Dockerfile reference"
2015-09-27 15:12:17 -07:00
60f76bbfe1
Touch up "Dockerfile reference"
...
- add example for `docker build -f ...`
- modifiy `FROM` explaination into bullet points
- add/clarify examples for `LABEL` and `ADD` instructions
- fix review comments (PR #16109 )
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2015-09-27 08:04:36 -07:00
f8f03a290c
Merge pull request #16338 from twaugh/env-replacement-label
...
Add documentation note that LABEL allows environment replacement
2015-09-27 08:00:53 -07:00
Mary Anthony