161c03c6c1
Merge pull request #15879 from Mashimiao/add-support-blkio_throtte_iops
...
Add support for blkio read/write iops device
Upstream-commit: 312c82677bdc86d50b483d642ad8c61f1c840c55
Component: engine
2015-12-21 23:45:18 +01:00
a9aa983363
Merge pull request #18809 from thaJeztah/EOL-ubuntu-15.04-vivid
...
Remove Ubuntu 15.04 (Vivid) from DEB build for 1.10 as it will be EOL
Upstream-commit: eff810aed688879f67a3730c41d9adce4637470f
Component: engine
2015-12-21 22:02:18 +01:00
306ef7b263
Merge pull request #17692 from vdemeester/images-format
...
Add --format support to images command
Upstream-commit: 42460b6772323552bfb58ae703124145ffd8a56b
Component: engine
2015-12-21 09:57:29 -08:00
f41d29a49b
Add --format support to images command
...
- rename `api/client/ps` to `api/client/formatter`
- add a a image formatter
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 34a3c3cacf2fd827f13a5e37541acff1409658c4
Component: engine
2015-12-21 17:38:07 +01:00
1c5df6581b
Change the quiet flag behavior in the build command
...
Right now, the quiet (-q, --quiet) flag ignores the output
generated from within the container.
However, it ought to be quiet in a way that all kind
of diagnostic output should be ignored, unless the build
process fails.
This patch makes the quiet flag behave in the following way:
1. If the build process succeeds, stdout contains the image ID
and stderr is empty.
2. If the build process fails, stdout is empty and stderr
has the error message and the diagnostic output of that process.
If the quiet flag is not set, then everything goes to stdout
and error messages, if there are any, go to stderr.
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: 60b4db7eb17f4eb509be4a4968364ada2075d60c
Component: engine
2015-12-21 16:38:50 +02:00
7363973c86
Merge pull request #18804 from mqliang/patch-6
...
Update selectadriver.md
Upstream-commit: 6d04d9cda8061456b921569266ca9f996c4b7eae
Component: engine
2015-12-21 09:56:05 +01:00
51d11f3a43
update document
...
Signed-off-by: mqliang <mqliang.zju@gmail.com >
Upstream-commit: 41c2dab459ff9e4075e15889b7aea03cab58ce71
Component: engine
2015-12-21 11:53:38 +08:00
a04e1f9592
Add support for blkio read/write iops device
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 843084b08b521a70baf9284ec4e23e941ab38367
Component: engine
2015-12-21 09:14:49 +08:00
afa2c3e567
Merge pull request #18798 from mqliang/patch-1
...
Update dockervolumes.md
Upstream-commit: e9f72410ae5c91133a63fbe2d2bd9b36614bc460
Component: engine
2015-12-21 01:09:52 +01:00
6c1f488ddd
Merge pull request #18801 from mqliang/patch-3
...
Update index.md
Upstream-commit: 83f28cb374f6e08e2e929ea86833c0976ce47cf3
Component: engine
2015-12-21 01:08:58 +01:00
13594ddd74
Update restart description
...
add a note around restart policies only working in detached mode
Signed-off-by: Aidan Feldman <aidan.feldman@gmail.com >
Update restart description with Mary's comments.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: c32ec8b93b199168425f29cab040d9d8cc23566f
Component: engine
2015-12-21 00:58:30 +01:00
97e9ddadc9
Merge pull request #18790 from tbonza/master
...
updated fedora yum to dnf package manager
Upstream-commit: 91b56a7c269c45a12b3c2e7643caa5dc3ca761bd
Component: engine
2015-12-20 08:46:31 -08:00
68d7fb0472
Merge pull request #18806 from mqliang/patch-8
...
Update btrfs-driver.md
Upstream-commit: 9f306364f573e99d3dd6d7db7c57a23ac27fc5a8
Component: engine
2015-12-20 17:24:29 +01:00
4fa7f47239
Update dockervolumes.md
...
Signed-off-by: mqliang mqliang.zju@gmail.com
Signed-off-by: lmq <mqliang@lmqs-MacBook-Pro.local >
Upstream-commit: 3dd90e564c65e3a38160a6d24c036c0b0ee3c8b8
Component: engine
2015-12-20 23:41:00 +08:00
5597d2d934
Update btrfs-driver.md
...
Signed-off-by: lmq <mqliang@lmqs-MacBook-Pro.local >
Upstream-commit: 8737896e421ed5a9c90a7b0e4395633ea93f8f92
Component: engine
2015-12-20 23:08:01 +08:00
d095d83f03
Remove Ubuntu 15.04 (Vivid) from DEB build as it will be EOL
...
Ubuntu 15.04 (Vivid) will be EOL'd in January,
so we should remove it from our builds in the
Docker 1.10 release.
For information about the EOL data, see:
https://wiki.ubuntu.com/Releases
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 325b1f35ae7419cd7454800c8eda4dfaca1d9a77
Component: engine
2015-12-20 16:00:53 +01:00
35d7acd5b7
Update index.md
...
fix typo in document
Signed-off-by: mqliang mqliang.zju@gmail.com
Signed-off-by: lmq <mqliang@lmqs-MacBook-Pro.local >
Upstream-commit: 38ee016966ef5ad8f08d42c9a0dd9effd6930c73
Component: engine
2015-12-20 23:00:38 +08:00
f64ebb2c89
Merge pull request #18794 from thaJeztah/EOL-fedora-21
...
Remove Fedora 21 from RPM build as it is EOL
Upstream-commit: cc6f0df2e41c7d01dffd8e0630c14275960130fc
Component: engine
2015-12-20 11:53:51 +01:00
0e3b79cb4d
Merge pull request #18707 from runcom/update-labels-doc-for-emtpy-lables
...
update syntax for empty value labels
Upstream-commit: 18925f37ed5cfb9dd54ee10ee99bc5f990f156b0
Component: engine
2015-12-19 21:53:21 -08:00
27d8c0709b
Merge pull request #18720 from kytrinyx/unspecific-ubuntu
...
docs: remove ubuntu version in dockerizing userguide
Upstream-commit: 3d43ebebfae82b4c5cf5ce0987d087e7059829aa
Component: engine
2015-12-19 21:17:38 -08:00
bfd2cf3356
Merge pull request #18667 from bboreham/inspect-json-doc
...
Improved explanation of docker inspect 'json' function
Upstream-commit: fa720ad98746eb33073af9f4fde16df4f774644f
Component: engine
2015-12-19 21:09:39 -08:00
007bebfe87
Update link to Oracle Linux
...
The https://linux.oracle.com/ url results in
too many redirects, which may result in our
link-checker to think the link is broken.
Replacing the link, per discussion in
https://github.com/docker/docker/pull/18534#issuecomment-164202592
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 579d35e33c161fa20bf6cf8d0e41969d9821e378
Component: engine
2015-12-20 00:52:12 +01:00
8d399a7fd9
Remove Fedora 21 from RPM build as it is EOL
...
Fedora 21 is EOL'd as of December 1st, 2015.
Announcement:
https://lists.fedoraproject.org/pipermail/announce/2015-November/003296.html
Fedora 21 will reach end of life on 2015-12-01, and no further updates
will be pushed out after that time. Additionally, with the recent
release of Fedora 23, no new packages will be added to the Fedora 21
collection.
Please see https://fedoraproject.org/wiki/DNF_system_upgrade for more
information on upgrading from Fedora 21 to a newer release.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: a08c955e30d6790d1f69483d5e33e2a81a08b100
Component: engine
2015-12-20 00:42:17 +01:00
ba3901d719
Fixing typo reported by @projectvalis
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 55a65e18c08e2612b5cc7384119e6ec44e476da7
Component: engine
2015-12-19 12:47:24 -08:00
2cab6a8278
updated fedora yum to dnf package manager Signed-off-by: Tyler Brown <tylers.pile@gmail.com>
...
Upstream-commit: 0635403536802063e8633ab04a6a825a1daa02c4
Component: engine
2015-12-19 15:04:19 -05:00
8acdb0b4d5
Merge pull request #18684 from cdauth/volume-docs
...
Add note to volume docs that data is not copied to mounted volumes
Upstream-commit: 69fbdf4294b9c062bc711b978efcde82e40a293f
Component: engine
2015-12-19 15:29:44 +01:00
3c6477529c
Merge pull request #18769 from runcom/docs-auth-1
...
docs: extend: authorization.md: add a note about confidential stuff in Err
Upstream-commit: eaf7932fafdfdbcefa3be3ccacab016938969cf4
Component: engine
2015-12-19 14:53:25 +01:00
295cafe7dd
docs: userguide: labels-custom-metadsata.md: update syntax for emtpy value labels
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: aada8d81177de793db38845ff3a26949436e1ed6
Component: engine
2015-12-19 09:04:29 +01:00
d63981ab4d
authZ: more fixes
...
- fix naming and formatting
- provide more context when erroring auth
- do not capitalize errors
- fix wrong documentation
- remove ugly remoteError{}
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 5a64c8027ecd2bebe773c9abd2e73c2fd7d23de1
Component: engine
2015-12-18 16:29:01 +01:00
7d0507241f
docs: extend: authorization.md: add a note about confidential stuff in Err
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 1e28f04fec70affd8fae57f4bdd23a84853f4efc
Component: engine
2015-12-18 11:28:28 +01:00
1dd48fd37d
Merge pull request #18739 from wenchma/typo
...
Fix typo error and update index
Upstream-commit: 742fd4fa633bfb105e501b74cc27871a972e8001
Component: engine
2015-12-17 15:43:14 +01:00
5d75803e83
Merge pull request #18743 from wenchma/plugin_not_found
...
Sync the docker network create api docs with the error code
Upstream-commit: 3f4dc492102bf4bceea92a59c78439420f7527c9
Component: engine
2015-12-17 12:16:23 +01:00
ce29ee35b2
Merge pull request #18662 from runcom/pkg-authZ-response
...
pkg: authorization: add Err to tweak response status code
Upstream-commit: 5baa93c04ef4a195df397914baf0a980c93d1271
Component: engine
2015-12-17 11:12:27 +01:00
98eeaeab93
pkg: authorization: add Err to tweak response status code
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 46e3a249a1971f8697ca338c9b02e27d36ddab12
Component: engine
2015-12-17 11:08:47 +01:00
fe1109030f
Sync the docker network create api docs with the error code
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 597835e6454be55963959f5f9d586b71517a7f1e
Component: engine
2015-12-17 17:48:50 +08:00
9a50c6c5f4
Merge pull request #18559 from ahmetalpbalkan/return-container-networks
...
Proposal: Add container networks list to /containers/json
Upstream-commit: 0f749ad55ab794872e601b4f665b07c0be07abfc
Component: engine
2015-12-17 10:11:18 +01:00
290e29f4c7
Fix typo error and update index
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: e0db2fa4da8f4de861ff83e6f19e7e6d4251289d
Component: engine
2015-12-17 15:40:10 +08:00
7c30c7ccac
Merge pull request #15964 from duglin/APIVersion
...
Add a DOCKER_API_VERSION env var
Upstream-commit: 905f3336b2715b3960b5ff4f860db387797d9adf
Component: engine
2015-12-16 14:23:47 -08:00
2dc1c7dfce
Merge pull request #18671 from saturnism/patch-1
...
Updated REX-Ray plugin platform support.
Upstream-commit: cd1ace316df667719da810e2998c72dd2f2ef566
Component: engine
2015-12-16 14:16:12 -08:00
e457303049
docs: remove ubuntu version in dockerizing userguide
...
The docs/installation/mac guide causes a user to download the
`ubuntu` image, which defaults to `ubuntu:latest`.
After installing the next logical step is to work through
the userguide. If the userguide specifies ubuntu:14.04, then
a second ubuntu image will be downloaded.
On slow internet connections this takes a long time.
The cost of specificity in this case seems higher than the value.
Since this might be the first or second interaction a user has
with docker, they might not realize that they can remove the ":14.04"
bit to use the image that was previously downloaded.
Signed-off-by: Katrina Owen <katrina.owen@gmail.com >
Upstream-commit: 68b07c0af947956581b1c3c1692ab5d8f96af73d
Component: engine
2015-12-16 11:25:15 -07:00
c819e8f023
Merge pull request #18703 from runcom/nit-plugins-volume
...
docs: extend: plugins_volume.md: Err default to empty string
Upstream-commit: 8f2a15b88096b3196356240eac5704a17949a9ea
Component: engine
2015-12-16 12:23:34 -05:00
a99a73ad6e
Merge pull request #18700 from mqliang/patch-2
...
Update dockernetworks.md
Upstream-commit: 6f930a2ffa57b022947743d6f16751a27b93fbed
Component: engine
2015-12-16 16:58:25 +01:00
fb506b92c1
docs: extend: plugins_volume.md: Err default to empty string
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: cc62a88524b623c8f86075d9ed220196cf5e92da
Component: engine
2015-12-16 09:52:26 +01:00
b6343dc716
Update dockernetworks.md
...
fix typo
Signed-off-by: mqliang <mqliang.zju@gmail.com >
Upstream-commit: f480b7c1f576f033ee276a026a790de415b9bf9c
Component: engine
2015-12-16 15:25:06 +08:00
86c606852c
fix typo in dockerlinks.md
...
fix typo in dockerlinks.md
Signed-off-by: mqliang <mqliang.zju@gmail.com >
Upstream-commit: e1f012cf397f170e12443e4993c09171791d37db
Component: engine
2015-12-16 11:21:39 +08:00
0515ab43ec
Add note to volume docs that data is not copied to mounted volumes
...
Signed-off-by: Candid Dauth <cdauth@cdauth.eu >
Upstream-commit: efb763aa10187e049fc6854e5a97efc410fcd214
Component: engine
2015-12-15 20:27:35 +01:00
2a2006ef18
Merge pull request #17034 from rhvgoyal/volume-propagation
...
Capability to specify per volume mount propagation mode
Upstream-commit: ce0b1841c82b6972d96654e083f813944e72443f
Component: engine
2015-12-15 12:14:41 -05:00
6cfc285ba0
Updated REX-Ray plugin platform support.
...
REX-Ray added Google Compute Engine support: https://github.com/emccode/rexray/issues/113
Signed-off-by: Ray Tsang <rayt@google.com >
Upstream-commit: 22023e05a319c60af2bc2c2f30ade8fa1f6f33fe
Component: engine
2015-12-15 11:21:19 -05:00
34e0c13d67
fixed typo
...
Signed-off-by: mqliang <mqliang.zju@gmail.com >
Upstream-commit: 4c1243dc76ad4afa6cfa6eec3070073ba0cb0c6a
Component: engine
2015-12-15 23:00:47 +08:00
e621a10208
Explain 'json' function a bit better
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com >
Upstream-commit: c170e971977d32f16916d1189c5755c79e36fc56
Component: engine
2015-12-15 13:41:47 +00:00
