clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-08-28 21:35:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,102 Commits 9 Branches 112 Tags
6928729cf9d718d30fbba96e195d250877d9e3da
Commit Graph

311 Commits

Author SHA1 Message Date
Madhu Venugopal 17fb8c3c5a Updating networking docs with technical information 
- the /etc/hosts read caveat due to dynamic update
- information about docker_gwbridge
- Carries and closes #17654
- Updating with last change by Madhu
- Updating with the IPAM api 1.22

Signed-off-by: Mary Anthony <mary@docker.com>
(cherry picked from commit 39dfc536d444df8745124ffa38504241a0a985f7)

Conflicts:
	docs/reference/api/docker_remote_api_v1.22.md
 2015-11-03 12:01:52 -05:00
Mary Anthony b53c39f606 Fixing ZooKeeper and some other nits Nathan found 
Signed-off-by: Mary Anthony <mary@docker.com>
(cherry picked from commit 0f1083c8dacb2ad189ccc4e4779c7e2dd054cb6b)
 2015-11-03 12:01:52 -05:00
Sebastiaan van Stijn 5d72b7a582 docs: update remote API responses and minor fixes 
Add back the "old" networksettings fields that were removed,
but added back to maintain backward compatibility, in
https://github.com/docker/docker/pull/17538

Update network endpoint responses, with updated response
introduced in;
https://github.com/docker/docker/pull/17536

Added changes to v1.22 that were applied to the v1.21 / v1.20 docs
after the API bump(s);

https://github.com/docker/docker/pull/17085
https://github.com/docker/docker/pull/17127
https://github.com/docker/docker/pull/13707

Also fixed some mixed tab/spaces indentation
and Markdown formatting issues (causing code-blocks to
be rendered incorrectly)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 286fe69d5376add77dc31833dc3c2fcc9639dd17)

Conflicts:
	docs/reference/api/docker_remote_api_v1.22.md
 2015-11-03 12:01:51 -05:00
Mary Anthony fa2a6b3522 First pass at consolidating 
Removing old networking.md
Updating dockernetworks.md with images
Adding information on network plugins
Adding blurb about links to docker networking
Updating the working documentation
Adding Overlay Getting Started
Downplaying links by removing refs/examples, adding refs/examples for network.
Updating getting started to reflect networks not links
Pulling out old network material
Updating per discussion with Madhu to add Default docs section
Updating with bridge default
Fix bad merge
Updating with new cluster-advertise behavior
Update working and NetworkSettings examples
Correcting example for default bridge discovery behavior
Entering comments
Fixing broken Markdown Syntax
Updating with comments
Updating all the links

Signed-off-by: Mary Anthony <mary@docker.com>
(cherry picked from commit 9ef855f9e5fa8077468bda5ce43155318c58e60e)
 2015-11-03 12:01:51 -05:00
Mary Anthony dfad0c3da7 Fixing broken links 
Fixing the weight

Signed-off-by: Mary Anthony <mary@docker.com>
(cherry picked from commit 5ce093e94565a5f32df9adf78dcdb6deeda75f79)

Conflicts:
	docs/reference/api/docker_remote_api.md
	docs/reference/api/docker_remote_api_v1.21.md
	docs/reference/api/docker_remote_api_v1.22.md
 2015-11-02 23:13:29 -05:00
Eric Rosenberg 75f6674b11 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>
(cherry picked from commit c1a5ee53c19d62918f5ef245b5d2268fb9c89ca8)
 2015-10-30 20:27:45 -04:00
David Calavera c57d1e026d Update inspect api examples with new network settings. 
Signed-off-by: David Calavera <david.calavera@gmail.com>

Conflicts:
	docs/reference/api/docker_remote_api_v1.22.md
 2015-10-27 20:11:08 -04:00
Mary Anthony 6b779ead93 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 19:57:02 -04:00
Kun Zhang 7ac3502444 command missing 'daemon' 
Signed-off-by: Kun Zhang <zkazure@gmail.com>

Conflicts:
	docs/reference/logging/splunk.md
 2015-10-27 19:57:02 -04:00
Vincent Demeester 7ff56c563d Use RepoTags & RepoDigest in inspect 
To be coherent with /images/json (images command)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-10-22 17:22:16 -04:00
Sven Dowideit f2671e07b3 Fix some errant links 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-10-22 16:14:13 -04:00
Tobias Gesellchen b63c2ab3c1 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-22 15:07:06 -04:00
Hu Keping 69cfb521bb Docs: update docs for API stats 
Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-10-22 15:07:04 -04:00
Aidan Hobson Sayers 10b594924a Update ambassador image, use the socat -t option 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
 2015-10-22 15:07:04 -04:00
Tobias Gesellchen 08cec812cb docs: fix description of filters param for /volumes and /networks. 
fixes #17091

Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
 2015-10-22 15:07:03 -04:00
Sebastiaan van Stijn 1d5b8348ce 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-22 15:07:02 -04:00
Vincent Demeester c0705bc51d Deprecate -c cli short variant flag in docker cli 
- build
- create

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-10-22 15:07:02 -04:00
Daniel Nephin 71f5c74a04 Correct API docs for /images/create 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-22 15:07:00 -04:00
Mary Anthony 78afc5876a bad d 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-10-22 15:07:00 -04:00
Mary Anthony 3748494073 Removing extra tic 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-10-22 15:07:00 -04:00
Madhu Venugopal 14897a0b47 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-22 15:06:59 -04:00
Victor Vieux ac4349bd30 use Server Version 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-10-22 15:06:59 -04:00
Jian Zhang d1e3a75934 Improve the way we deliver Examples in command line. (Add descriptive titles) 
Signed-off-by: Jian Zhang <zhangjian.fnst@cn.fujitsu.com>
 2015-10-22 15:06:58 -04: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