centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-29 07:18:51 +07:00
Code Issues Packages Projects Releases Wiki Activity
20,092 Commits 54 Branches 28 Tags
692bfdaee3b48f4e5174bb80098692a0ded1aecf
Commit Graph

4435 Commits

Author SHA1 Message Date
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
Jessica Frazelle
26701e2d9f fix depreciation dates 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-10-09 20:24:04 -07: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
Diogo Monica
d9a2fadb5e Changing docs to reflect new names 
Signed-off-by: Diogo Monica <diogo@docker.com>
 2015-10-09 15:13:37 -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
Sebastiaan van Stijn
3526993b2f Merge pull request #16108 from charleswhchan/patch-2 
Touch up Node.js and MongoDB examples
 2015-10-09 15:33:30 +02: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
moxiegirl
b7083cf08b Merge pull request #15903 from charleswhchan/patch-1 
Revise documentation for Docker LABEL.
 2015-10-09 06:11:50 -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
Lorenz Leutgeb
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
Lei Jitang
458ec418cd Add more cgroup config to docker info 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-10-09 03:02:04 -04:00
Charles Chan
c7e0531c3a Revise documentation for Docker LABEL, including review comments by @SvenDowideit and @thaJeztah in PR #15903. 
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
 2015-10-08 20:47:09 -07:00
Sebastiaan van Stijn
bccf5c756b Merge pull request #16861 from moxiegirl/fix-testing-stuff 
Removing the tests.
 2015-10-09 00:46:02 +02:00
Mary Anthony
5a94d2b5b9 Removing the tests. We have training site now. 
Ugh...actually adding the files to delete

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-10-08 15:22:59 -07: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
Sebastiaan van Stijn
80469f8180 Merge pull request #16850 from moxiegirl/fix-command-meta 
Fixing issues introduced with new commands adding index
 2015-10-08 20:59:59 +02:00
Jess Frazelle
73e3d85c28 Merge pull request #16791 from flaccid/patch-1 
Do not run yaourt as root/sudo
 2015-10-08 11:50:56 -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
52de250496 Merge pull request #16832 from sunyuan3/daemoncommand 
Replace the deprecated -d with docker daemon.
 2015-10-08 10:06:10 -04: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
Sebastiaan van Stijn
6fda30a437 docs: minor fix in faq, and update link 
The registry doesn't have containers, only images.
Also updated the Docker Hub link to the new location.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-10-08 13:49:30 +02: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
Yuan Sun
b08c6b1768 Replace the deprecated -d with docker daemon. 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-10-08 10:25:16 +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
Jessica Frazelle
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
Madhu Venugopal
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
Aidan Hobson Sayers
4cb0790a62 Mention more realistic examples are available 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
 2015-10-07 11:45:57 +01:00
Aidan Hobson Sayers
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
Vivek Goyal
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
Aidan Hobson Sayers
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
Chris Fordham
e9c64b6d99 Do not run yaourt as root/sudo 
Signed-off-by: Chris Fordham <chris@fordham-nagy.id.au>
 2015-10-06 17:59:52 +11:00
Sebastiaan van Stijn
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
moxiegirl
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