0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
19084 commits 14 branches 412 tags 338 MiB
Commit graph

301 commits

Author SHA1 Message Date
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
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
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
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
Mike Brown
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
Vincent Demeester
cd426ebed7 Add docs for label/env log-opts 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-10-13 08:39:47 +02:00
Jess Frazelle
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
Sebastiaan van Stijn
dc500630ec Merge pull request #16942 from physicalit/master 
Add CMD and EXPOSE instruction example
 2015-10-12 15:26:30 -07:00
Victor Costan
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. This change updates the API
documentation to reflect the existing support.

Signed-off-by: Victor Costan <costan@gmail.com>
 2015-10-12 11:26:39 -04:00
Daniel Hiltgen
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
Mihuleacc Sergiu
fad2cc6a18 Add CMD and EXPOSE instruction example 
Signed-off-by: Mihuleacc Sergiu <mihuleac.sergiu@gmail.com>
 2015-10-12 17:30:47 +03:00
Kun Zhang
0ff3123eba volume create error on conflict option 
Signed-off-by: Kun Zhang <zkazure@gmail.com>
 2015-10-12 11:16:39 +08:00
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Mary Anthony
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
Zhang Kun
b4d6b23838 add size to inspect 
Signed-off-by: Zhang Kun <zkazure@gmail.com>
 2015-10-10 20:44:29 +08:00
Sven Dowideit
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
Sebastiaan van Stijn
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
moxiegirl
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
Shijiang Wei
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
moxiegirl
06146b333c Merge pull request #16876 from luca3m/patch-1 
Sync with remote API
 2015-10-09 06:30:02 -07:00
moxiegirl
734c9d2f67 Merge pull request #16833 from sunyuan3/cpu-shares 
Add description for "--cpu-shares=0".
 2015-10-09 06:29:18 -07:00
Luca Marturana
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
Jess Frazelle
b50a88cfd7 Merge pull request #16644 from dhiltgen/discovery_tls 
Add TLS support for discovery backend
 2015-10-08 14:21:06 -07:00
moxiegirl
246072e8c5 Merge pull request #16837 from x1022as/network 
update dockernetwork.md and network api
 2015-10-08 12:27:49 -07:00
Mary Anthony
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
James Turnbull
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
moxiegirl
df6cd114a0 Merge pull request #15265 from greaber/dockerignore-docs 
Further clarifications to .dockerignore docs
 2015-10-08 06:24:44 -07:00
Deng Guangxing
54f98f40a4 update dockernetwork.md and network api 
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
 2015-10-08 15:34:24 +08:00
Yuan Sun
b7249569e2 Add description for "--cpu-shares=0". 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-10-08 10:50:55 +08:00
Daniel Hiltgen
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
Januar Wayong
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
Grant Reaber
899ecc11c5 clarify dockerignore semantics 
Signed-off-by: Grant Reaber <grant.reaber@gmail.com>
 2015-10-07 15:51:57 -05:00
moxiegirl
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
Arnaud Porterie
8e31036816 Merge pull request #16645 from mavenugo/ux 
Docker Network UX & remote API changes
 2015-10-07 10:44:58 -07:00
Jess Frazelle
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