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

375 commits

Author SHA1 Message Date
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
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
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
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
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
Vincent Demeester
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
Sebastiaan van Stijn
67eb810a60 Merge pull request #16744 from runcom/fix-mam-commandline 
Fix man and commandline docs
 2015-10-04 22:28:19 +02:00
Antonio Murdaca
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
Daniel Nephin
c1713e7c5a Documentation for filtering events by label 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-02 16:45:08 -04:00
Brian Goff
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
Jess Frazelle
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
Lei Jitang
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
Arnaud Porterie
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
Daniel Nephin
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
Richard Scothern
4acf29a808 Command line, manpage and deprecation documentation. 
Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
 2015-09-28 10:31:04 -07:00
Andrea Luzzardi
9324b154d2 Merge pull request #16229 from icecrime/discovery 
Add builtin nodes discovery
 2015-09-27 18:06:27 -07:00
moxiegirl
486c12525f Merge pull request #16109 from charleswhchan/patch-3 
Touch up "Dockerfile reference"
 2015-09-27 15:12:17 -07:00
Charles Chan
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
moxiegirl
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
Arnaud Porterie
7d193ef1f3 Add builtin nodes discovery 
Use `pkg/discovery` to provide nodes discovery between daemon instances.

The functionality is driven by two different command-line flags: the
experimental `--cluster-store` (previously `--kv-store`) and
`--cluster-advertise`. It can be used in two ways by interested
components:

1. Externally by calling the `/info` API and examining the cluster store
   field. The `pkg/discovery` package can then be used to hit the same
   endpoint and watch for appearing or disappearing nodes. That is the
   method that will for example be used by Swarm.
2. Internally by using the `Daemon.discoveryWatcher` instance. That is
   the method that will for example be used by libnetwork.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-09-25 14:52:09 -07:00
Jess Frazelle
84b53c8d87 Merge pull request #14579 from hqhq/hq_add_softlimit 
Add support for memory reservation
 2015-09-24 12:11:36 -07:00
Brian Goff
40e8560412 Merge pull request #16415 from HuKeping/dockerinfo 
Format output of docker info
 2015-09-23 21:15:23 -04:00
Tobias Gesellchen
78de066a28 fix content-type of response for /commit 
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
 2015-09-23 23:49:16 +02:00
Hu Keping
141e91c480 Format output of docker info 
Format those info which will only be displayed when daemon is
in debug mode.

Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-09-23 14:35:13 +08:00