8de6090cf2
Merge pull request #22336 from thaJeztah/carry-21174-update-docker-info-docs
...
Updated docker-info output and documentation
Upstream-commit: c14b1e39641fd575f59ef8c8556158d595eff284
Component: engine
2016-05-04 15:33:21 +02:00
820803730c
Merge pull request #22386 from wenchma/dockerd
...
Update the `docker daemon` to `dockerd` for document
Upstream-commit: 1c1947dd29def10260e61688112eeac665761ace
Component: engine
2016-05-04 15:07:53 +02:00
f77b6d2fb7
fix typo
...
fix typo
Signed-off-by: Qizhao Yang <windfarer@gmail.com >
Upstream-commit: 176e9e2ffc192862f104b13bdf651551c1e492f1
Component: engine
2016-05-04 19:18:38 +08:00
dc0034a921
Merge pull request #22394 from SvenDowideit/use-docs-base-oss
...
convert docs Dockerfiles to use docs/base:oss
Upstream-commit: 1c0edf6c3953d0f298d3dc1ec19f71f0b3b57b19
Component: engine
2016-05-03 10:48:29 +10:00
dab6ceb6f9
Merge pull request #21945 from rhvgoyal/export-min-free-space
...
Export Mininum Thin Pool Free Space through docker info
Upstream-commit: 227c83826aafbbcb3235d75cf7ab58392e552a83
Component: engine
2016-05-02 20:20:08 -04:00
33656931d9
Remove response modification sections from authorization design doc
...
Signed-off-by: Liron Levin <liron@twistlock.com >
Upstream-commit: 638096431a36435aae0e30b6c76c134a4728ed5d
Component: engine
2016-05-02 22:19:23 +03:00
ef3d0f56d0
remove "the" in docs.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: 043c9ef076477a391a58792930100402b48bbe1e
Component: engine
2016-05-01 15:37:11 +08:00
04f7572de5
Merge pull request #22282 from fntlnz/docs-authorization-plugins
...
Mention the fact that authz plugins are available today
Upstream-commit: d32345240c39b990a00d5d3e740a90a1f57d1251
Component: engine
2016-04-30 13:23:58 +02:00
d380357613
Merge pull request #22319 from thaJeztah/network-driver-filter
...
Add "driver" filter for network ls
Upstream-commit: 7a5658129740cd8e4345246758aa30fe3c835d10
Component: engine
2016-04-30 10:38:10 +02:00
55b8abe106
Merge pull request #22241 from bfirsh/update-remote-api-client-libraries-page
...
Update remote API client libraries page
Upstream-commit: cd418701326f91c71194e2e09d71a0692705de78
Component: engine
2016-04-30 00:39:29 +02:00
7c03d41081
update API example response for docker events
...
the events API was rewritten in 723be0a3325799fd6b2a6b689af54f5a07edf992,
but the example response in the documentation doesn't reflect the actual output
this fixes the example response
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 3932d46a7878e3e75d8119f332b927fd2107cb32
Component: engine
2016-04-29 17:37:04 +02:00
19f67540e2
Updated docker-info output and documentation
...
- [x] Update man page description
- [x] Update man page sample output to something more current
Tested with: `TESTFLAGS='-check.f DockerSuite.TestInfoEnsureSucceeds*'
make test-integration-cli`
Signed-off-by: Lucas Chan <lucas-github@lucaschan.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 55d61e98baa9cfffa246b40f48b09b9865b585ca
Component: engine
2016-04-29 16:45:43 +02:00
6e410ce449
Add "driver" filter for network ls
...
This add a new filter to 'docker network ls'
to allow filtering by driver-name.
Contrary to "ID" and "name" filters, this
filter only supports an *exact* match.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 23e418b6c966a43a463a064053ce0c741b8e5159
Component: engine
2016-04-29 16:22:26 +02:00
79ba4ce6e9
Update the docker daemon to dockerd for document
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 24ec73f754da16e37726a3f1c6a59de508e255fc
Component: engine
2016-04-29 09:06:02 +08:00
35425a4320
Merge pull request #21613 from wzyboy/support-unixgram-syslog-address
...
Support unixgram syslog address
Upstream-commit: dbee44c9e0d9f8afbbb86efd2c0bcbd66440cbbc
Component: engine
2016-04-28 11:06:17 -04:00
507bf1ac80
Fix typo
...
Signed-off-by: Sylvain Bellemare <sylvain@ascribe.io >
Upstream-commit: 63aa03ce0a9d2390f684da3403c1cd0e004592d1
Component: engine
2016-04-28 15:15:08 +02:00
1fb6b77fa1
convert docs Dockerfiles to use docs/base:oss
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: a9935d276ee8c45a1fc7f3e387c173ed26c71682
Component: engine
2016-04-28 12:57:13 +00:00
dd728e39c9
Merge pull request #22320 from thaJeztah/docs-remove-duplicate-sentence
...
docs: remove duplicate line in "Understand the architecture"
Upstream-commit: d37e22b6237ba99adacf200e823d50aade38c551
Component: engine
2016-04-28 12:45:08 +02:00
d722206339
Merge pull request #22344 from cpuguy83/seccomp_for_centos
...
centos:7/oraclelinux:7 now includes libseccomp 2.2.1
Upstream-commit: 09021d6841b825dbaab901a34617358b03ae17ac
Component: engine
2016-04-28 12:26:22 +02:00
48a9de5e52
Support unixgram syslog address
...
- Consider unixgram:// as a valid URL prefix
- Parse unixgram:// addresses
- Update docs
Signed-off-by: Zhuoyun Wei <wzyboy@wzyboy.org >
Upstream-commit: 57fad95e4352c72c852d740e54fd693a446c552f
Component: engine
2016-04-28 11:04:50 +08:00
9074d644d1
Merge pull request #22362 from ZJU-SEL/update-doc
...
update cgroup link in doc of run
Upstream-commit: deb6ea4702924ff390e4a57414f735b18e4d7185
Component: engine
2016-04-28 00:48:47 +02:00
7b8da9de87
Merge pull request #22229 from riyazdf/notary-doc-update
...
Update DCT docs with 1.11 info, fix typos
Upstream-commit: 861815a3252b88a118a91a164246401fa24fa549
Component: engine
2016-04-27 09:59:30 -07:00
e27d461e96
Update DCT docs with 1.11 info, fix typos
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 77da3bcb72ba4f936c428cb2b912c007a94cb87a
Component: engine
2016-04-27 09:57:54 -07:00
661a968ea5
update cgroup link in doc of run
...
Signed-off-by: Hao Zhang <21521210@zju.edu.cn >
Upstream-commit: 8fec7c26d4e831481674bcab7a0539affc91da29
Component: engine
2016-04-27 08:50:46 -04:00
ff027b364b
Add load/save image event support
...
For every docker load and save operations, it would log related
image events.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: 06561057103441fe176910e12674d998b8561b75
Component: engine
2016-04-27 01:11:03 +00:00
ad49d67f49
centos:7/OL:7 now includes libseccomp 2.2.1
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 1521a41fc578958d0238f95b43c49edab9a65a47
Component: engine
2016-04-26 20:48:26 -04:00
b630bbc615
Merge pull request #21384 from Microsoft/10662-IOResourceControls
...
Add IO Resource Controls for Windows
Upstream-commit: a8c5ba75172686a2be2119a3b46c6acda02f0a36
Component: engine
2016-04-26 15:54:52 -07:00
21117de54d
Small API formating fix.
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 204a52c689204a4d9506d500955673f7b5361d1d
Component: engine
2016-04-26 10:29:31 +00:00
dee3200111
docs: remove duplicate line in "Understand the architecture"
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 00e84ca4d20ef35ab1bdc83889afbf3374ee9745
Component: engine
2016-04-25 23:16:49 +02:00
87afb49f07
Add IO Resource Controls for Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 8df2066341931d9b7ba552afa902e2ef12e5eed5
Component: engine
2016-04-25 13:07:29 -07:00
29f97fe87c
Mention the fact that authz plugins are available today
...
Signed-off-by: Lorenzo Fontana <fontanalorenzo@me.com >
Upstream-commit: 96cc1ee44cc4412511e944d48eed14434cac2c31
Component: engine
2016-04-25 15:31:23 +02:00
76284509d6
Merge pull request #22138 from wenchma/deprecated_since_before
...
Deprecated of docker ps since and before options for v1.12
Upstream-commit: 4e5ad97f5b2d9db237546e67de3049649c5ff5e8
Component: engine
2016-04-24 11:23:21 +02:00
95f6733644
Merge pull request #20639 from dnephin/split_client
...
Split the binary into two: client and daemon
Upstream-commit: 27f44b8af63d563f53c04b342cbafc3b8f27cb45
Component: engine
2016-04-23 14:14:20 -07:00
0f705c8304
Remove outdated Node.js example - include a link to the new guide later!
...
As recommended by @moxiegirl and squashed.
Signed-off-by: FWirtz <florian.wirtz08@gmail.com >
Upstream-commit: d9c0d67b51fc135b2dbf54a152105d124100eb5e
Component: engine
2016-04-23 14:10:24 +02:00
313a5e3ec8
Remove out-of-date client libraries
...
For each language, if there is one library which is clearly the
best or most active, I've removed the other libraries so users
aren't mislead.
I've removed the web UIs because they're not really client
libraries.
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: bb94cfce62b5b07f7ec00bfbbc229c7f87b7a6e8
Component: engine
2016-04-22 10:00:53 -07:00
dcd6f9747a
Build two binaries client and daemon.
...
Add a proxy to support 'docker daemon'
Fix configFile option, and remove a test that is no longer relevant.
Remove daemon build tag.
Remove DOCKER_CLIENTONLY from build scripts.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Change docker-daemon to dockerd.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 9e7651db4d464649bc32cf346fdee8c6900ebe0f
Component: engine
2016-04-22 11:26:01 -04:00
3e3ec58c45
Merge pull request #22196 from thaJeztah/add-mac-address-note
...
docs: add note about MAC addresses not being unique
Upstream-commit: 9b00817dc692458f9e27e375a870ecd0dcbd0b75
Component: engine
2016-04-22 11:26:17 +10:00
07010d4ac6
Fix lasote/docker_client link
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: 91fe274dcf09dfd580aaa1c88fa2ddbb4758bf66
Component: engine
2016-04-21 16:24:51 -07:00
4847a4f337
Export Mininum Thin Pool Free Space through docker info
...
Right now there is no way to know what's the minimum free space threshold
daemon is applying. It would be good to export it through docker info and
then user knows what's the current value. Also this could be useful to
higher level management tools which can look at this value and setup their
own internal thresholds for image garbage collection etc.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
Upstream-commit: 55a9b8123d7e89692b5c25c846cf6707a8ce463a
Component: engine
2016-04-21 15:42:23 +00:00
c289b3f431
Merge pull request #22193 from panyufeng920/master
...
optimise docs
Upstream-commit: 01dd64cd107b2a7d4c01be9074da155d65a79c57
Component: engine
2016-04-21 08:38:27 -07:00
0f8b8ed30c
Merge pull request #22220 from dandric-activevideo/fix-storage-opts-doc
...
Fix daemon.json storage-opts settings example
Upstream-commit: 70746f4c38322ca14cb62321ce73b08b18422a14
Component: engine
2016-04-21 09:53:03 -04:00
5b79c087d8
The daemon.json storage-opts settings is actually a list.
...
Signed-off-by: Dimitry Andric <d.andric@activevideo.com >
Upstream-commit: e3eb24fc21fa6f6002eef081278333f9e5e16614
Component: engine
2016-04-21 10:56:35 +02:00
a659558dcf
Fix the old exit status example
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: 896ebb1ca2a6ae23d7511678aaab1d4e32c54ff9
Component: engine
2016-04-21 03:24:10 +00:00
8c00bd5332
optimise docs
...
Signed-off-by: 搏通 <yufeng.pyf@alibaba-inc.com >
Upstream-commit: 9abf304c255cb3194b932e92f2b87bfabaab88c9
Component: engine
2016-04-21 09:34:28 +08:00
a63f858c5e
docs: add note about MAC addresses not being unique
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 763aceeb733cdd927eb2de6232f0257267b6f71e
Component: engine
2016-04-20 19:24:39 +02:00
f7b3af0900
Merge pull request #21389 from chenchun/resize_direct_lvm
...
Resize direct lvm
Upstream-commit: f96d15d3c361a08ad892759d5e885625b0d48302
Component: engine
2016-04-20 06:33:37 -07:00
a1c0412063
docs: use tables for available plugins
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 79351caec1b413c9da1080fceff49eb994323734
Component: engine
2016-04-20 13:45:31 +02:00
e790582111
Merge pull request #22179 from wenchma/fix_asa
...
Fix asa
Upstream-commit: 3cf4cad0821698cefaf852c9d4b7b65df314ab35
Component: engine
2016-04-20 12:44:29 +02:00
605211aab5
Fix asa
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 6d4e7b67be77e3f290d4048c3da5d0f6540f1704
Component: engine
2016-04-20 11:14:47 +08:00
7c4fbf51d2
Add docs about how to extend devicemapper thin pool
...
Signed-off-by: Chun Chen <ramichen@tencent.com >
Upstream-commit: b21d90c28faaa9f906c4e3b2145ddf661a19e994
Component: engine
2016-04-20 10:49:51 +08:00
