Commit Graph

5188 Commits

Author SHA1 Message Date
f15ebde7e0 Bump notary version up to 0.3.0 and re-vendor.
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 6094be63ac3d29c23024daa2152719b653c78092
Component: engine
2016-05-11 22:57:51 -07:00
d537ac63ac docs: update seccomp whitelist
the 'modify_ldt' was listed as "blocked by default",
but was whitelisted in 13a9d4e8993997b2bf9be7e96a8d7978a73d0b9b

this updates the documentation to reflect this

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2cddd1cd1f3135f36f6afcc84ddfda904aeee3b5
Component: engine
2016-05-11 18:45:27 +02:00
50921875d5 Update deprecated docs for cli flags removal.
The old command line options have been deprecated in 1.8.0 and
eventually removed in 1.10.0 through PR #17724, though the
deprecated.md still shows `Target For Removal In Release`.

This fix updates the deprecated.md and changes
`Target For Removal In Release` to `Removed In Release`.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 0a4de93e1371a0d62ca6f3a5121368d7ecfde3fe
Component: engine
2016-05-11 06:48:07 -07:00
b258c5f0d3 Merge pull request #22611 from tonistiigi/attach-docs
docs: clarify docker attach
Upstream-commit: e8aac7de4c2491cf7d9ba5233269602e6f5c54d3
Component: engine
2016-05-09 22:59:07 +02:00
e256c77fe9 docs: clarify docker attach
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: da1dbd2093ec040f05f4daf9fc8ca28dc8262ec8
Component: engine
2016-05-09 13:35:34 -07:00
cb9d2ba5ea Minor tense correction for deprecated docs
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: d73589331df4288aa6211fb3733598bbad67b73b
Component: engine
2016-05-09 10:29:42 -07:00
91eda97012 Merge pull request #22574 from yongtang/05072016-remove-deprecated-trust-env
Remove deprecated Docker Content Trust ENV passphrase variables
Upstream-commit: fad0305ee3f697c70654e4ade7dfdd92483eb3e1
Component: engine
2016-05-09 10:10:27 -07:00
34aa0cad09 Merge pull request #22572 from yongtang/05072016-add-missing-subtitle-in-deprecated-docs
Add the missing subtitle in deprecated docs for --security-opt
Upstream-commit: 3deb2d7280404f9fadd7af2a10bc9a0aad2fc419
Component: engine
2016-05-09 12:18:11 +02:00
86911550d2 Remove deprecated Docker Content Trust ENV passphrase variables
Since 1.9, Docker Content Trust Offline key has been renamed to
Root key and the Tagging key has been renamed to Repository key.
The corresponding environment variables
`DOCKER_CONTENT_TRUST_OFFLINE_PASSPHRASE`
`DOCKER_CONTENT_TRUST_TAGGING_PASSPHRASE`
have also been deprecated and renamed to
`DOCKER_CONTENT_TRUST_ROOT_PASSPHRASE`
`DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE`

This fix removed the deprecated ENV passphrase variables for
1.12 and updated the docs.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 1f0d5aba50803ff401197f96f6a830384d0c04c5
Component: engine
2016-05-07 14:25:28 -07:00
003c321b57 Merge pull request #21889 from cpuguy83/logscmd_add_attrs
Add support for reading logs extra attrs
Upstream-commit: 08ec3606f1656962084222412debf2888f15f553
Component: engine
2016-05-07 20:26:33 +02:00
42524ce9b8 Add the missing subtitle in deprecated docs for --security-opt.
The colon separator(`:`) of `--security-opt` flag was deprecated
in 1.11.0. However, the subtitle in deprecated docs is missing
so it is placed under the same subtitle as the deprecated `-e` and
`--email` flags.

This fix adds the missing subtitle in deprecated docs.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 018c22880d594b1de06216aa05186f2ebe9a1e9c
Component: engine
2016-05-07 08:46:15 -07:00
1237d12945 from inheritted to inherited
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: fe1130b7bab0d0724133b4d0e2aa0ca5a5dc0222
Component: engine
2016-05-07 17:15:02 +08:00
697f71e4f2 Add support for reading logs extra attrs
The jsonlog logger currently allows specifying envs and labels that
should be propagated to the log message, however there has been no way
to read that back.

This adds a new API option to enable inserting these attrs back to the
log reader.

With timestamps, this looks like so:
```
92016-04-08T15:28:09.835913720Z foo=bar,hello=world hello
```

The extra attrs are comma separated before the log message but after
timestamps.

Without timestaps it looks like so:
```
foo=bar,hello=world hello
```

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: bd9d14a07b9f1c82625dc8483245caf3fa7fe9e6
Component: engine
2016-05-06 20:42:20 -04:00
4cc231a9ad docs: note requirements for systemd drop-in filenames
the documentations says that you can drop "a file" into the
`docker.service.d` directory, but does not note that the file must end
with `.conf` in order to be recognized by systemd.  This can lead to
some [confusion][] if readers are not previously familiar with
systemd.

[confusion]: https://botbot.me/freenode/docker/2016-05-06/?msg=65605541&page=11

Signed-off-by: Lars Kellogg-Stedman <lars@redhat.com>
Upstream-commit: 987b03054af8bfa5147465d4fe5d5a554cd5fee3
Component: engine
2016-05-06 16:25:34 -04:00
b45f47d8a2 docs: update supervisord example
This updates the supervisor example documentation
to use an up-to-date version of Ubuntu.

Also reduced the use of "royal We", and tweaked some
language.

Finally, added some language hints for code-highlighting.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e38678e6601cc597b621aaf3cf630419a7963ae9
Component: engine
2016-05-06 01:52:51 +02:00
83644199c7 Merge pull request #21015 from cpuguy83/add_opaque_mount_id
When calling volume driver Mount, send opaque ID
Upstream-commit: bb125650c9fbff03d57c20fd8e4ecde90b3ec326
Component: engine
2016-05-05 18:00:15 +02:00
5f74b3f785 Merge pull request #22529 from objectified/22528-remove-trailing-comma-from-top-command
Documentation: docker volumes: remove trailing comma from top command
Upstream-commit: c37ca913ff66b4402aaa8f54e17498a09778be51
Component: engine
2016-05-05 17:26:06 +02:00
c427081daf remove trailing comma from top command
Signed-off-by: objectified <objectified@gmail.com>
Upstream-commit: c7e738d641e83ab955be423b70b9ed364dba9637
Component: engine
2016-05-05 13:18:23 +02:00
7884e766dc Add disk quota support for btrfs
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
Upstream-commit: 401c8d17674379d9b727d25df2d560a2dfe07f27
Component: engine
2016-05-05 14:35:13 +08:00
6901a6e26a Merge pull request #22166 from moxiegirl/device-mapper-update
Device mapper update
Upstream-commit: 6870d9789aea578f54e443293625a6b57496e10f
Component: engine
2016-05-05 00:02:02 +02:00
751e7f2553 Docs: fixing typos in admin/supervisor
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
Upstream-commit: 74d382ff8de9a870d48e7fd4cc63bb9ee254f3de
Component: engine
2016-05-04 22:35:57 +02:00
16a8047841 Add docs about how to extend devicemapper thin pool
Signed-off-by: Chun Chen <ramichen@tencent.com>

Update to device mapper
Entering comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: a7b2f87b0637a3711e90c0f1d0a99dd5d32bd60f
Component: engine
2016-05-04 12:32:14 -07:00
cd7f106f6e Merge pull request #22499 from duglin/removeQuotes
Remove unnecessary double-double quotes
Upstream-commit: e7584a7fdf2170a5a75a2376ed914176665efab9
Component: engine
2016-05-04 15:35:45 +02:00
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
bf2c596602 Remove unnecessary double-double quotes
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 8eb2188bd93c01533e201a37e1e674f5b53cb597
Component: engine
2016-05-04 05:15:57 -07: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
de046a0cf3 When calling volume driver Mount, send opaque ID
This generates an ID string for calls to Mount/Unmount, allowing drivers
to differentiate between two callers of `Mount` and `Unmount`.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 2b6bc294fc7f9e08a9091833b021b7d2a01ad2a6
Component: engine
2016-04-29 09:37:02 -04: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