b09d7888d3
Merge pull request #18891 from HackToday/18872-fix-volume-cmd
...
Fix the restore data example
Upstream-commit: dcbd5e04b79cab9e53f9700a07939f21a3268e6b
Component: engine
2016-01-02 00:43:46 +01:00
8a76cb28e3
Merge pull request #18932 from wenchma/same_name_of_container_image
...
Update integration tests when container and image have same name
Upstream-commit: 1a5b97c76143b7d26006916b23daf8fde73c35ac
Component: engine
2016-01-01 21:40:51 +01:00
38393c4316
fix typo
...
Signed-off-by: Anthon van der Neut <a.van.der.neut@ruamel.eu >
Upstream-commit: b4d4a805eaaf56c071327a528d8837f18796e209
Component: engine
2016-01-01 20:39:04 +01:00
479e415aa9
Fix the restore data example
...
Fixes : #18872
For backup, restore case, we usually restore in same directory, so
when we untar it, we not need go to /dbdata directory, wich could
result in /dbdata/dbdata, this fix make it untar directly. The directory
/dbdata would be same as old container /dbdata.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: 83c705c00d9be3d5064a7a3fcc5de0645fce21b1
Component: engine
2015-12-31 00:56:01 +00:00
301494dba6
Merge pull request #18964 from hqhq/hq_fix_memory_swap_doc2
...
Fix docs for memory-swap
Upstream-commit: 2c3d1a9b126d45647cfe8aa89008a93f83203a0c
Component: engine
2015-12-30 21:01:48 +01:00
2821f3dd6b
Merge pull request #18764 from donovan/fix-networkingcontainers-ip-addresses
...
fix incorrect ip addresses in networkingcontainers
Upstream-commit: 3b605b5926cff095452f2c2dca374bd132e23fac
Component: engine
2015-12-30 17:49:08 +01:00
c8d08c88b3
Fix docs for memory-swap
...
Fixes : #18894
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: c68a483e442758733e800546545f1e016113d9cd
Component: engine
2015-12-30 09:23:35 +08:00
069aa886a5
Merge pull request #18627 from londoncalling/cloud-installs
...
[WIP] docs updates per issue 18282 cloud installs
Upstream-commit: de84dfba75a3055b8cad4eb8e6d9fd7bcecc30fc
Component: engine
2015-12-29 14:54:18 -08:00
9d5c330d8f
Fix typo in daemon storage-driver docs
...
Signed-off-by: Thomas Swift <tgs242@gmail.com >
Upstream-commit: c44a8d8d8c9eccb79b16c874f083cd9597c3f6ca
Component: engine
2015-12-29 17:06:02 -05:00
4b86854122
Update integration tests when container and image have same name
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 9fbb1306e83576086e924ff4fbf35b9a74beb28a
Component: engine
2015-12-29 11:08:31 +08:00
f07bb00458
Merge pull request #18780 from jfrazelle/seccomp-default
...
set default seccomp profile
Upstream-commit: 78ce43bad85fdf97d7c836315e46b531901c8ae7
Component: engine
2015-12-28 16:46:30 -08:00
3f6acddbd7
Fixed /etc/defaults/docker to /etc/default/docker
...
/etc/default/docker is the correct file location in my system, and also according Docker's own documentation at https://github.com/docker/docker/blob/master/docs/articles/configuring.md#configuring-docker
Signed-off-by: J Bruni <contato@jbruni.com.br >
Upstream-commit: 153948ac46851397c9c4fd8117647c608f4d216a
Component: engine
2015-12-28 20:57:36 -02:00
383605ec04
Merge pull request #18899 from cpswan/18898-fix-storage-driver-example
...
Fix --storage-driver example
Upstream-commit: 8c6ad0991e313805ea2c67275086f2c9130cceda
Component: engine
2015-12-28 21:58:43 +01:00
3f03a2c89c
add docs and unconfined to run a container without the default seccomp profile
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 15674c5fb74df00d7560fb35619a5372ea2ee74e
Component: engine
2015-12-28 10:26:51 -08:00
3ae3fdb79c
Merge pull request #15078 from hqhq/hq_add_set_api_v2
...
Implement docker update command
Upstream-commit: 8669ea01ba93139a51783ac17658dedd47538b9c
Component: engine
2015-12-28 08:55:32 -08:00
c4af30652d
Implemet docker update command
...
It's used for updating properties of one or more containers, we only
support resource configs for now. It can be extended in the future.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 8799c4fc0feadede6ae60e77bd7d9dfd7cc72a79
Component: engine
2015-12-28 19:19:26 +08:00
6a84e60720
Specify that Docker requires x64
...
Adds this requirement to docker/docker. Already replicated in docker/tutorials
Resolves : #18401
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com >
Upstream-commit: 8134a562c603679a02bc7841f10676ddba6e4001
Component: engine
2015-12-26 19:02:20 -05:00
3dd9453e30
Merge pull request #18775 from mrjana/mh
...
libnetwork vendoring
Upstream-commit: d4270c1764bbebb2eaaafc86837970b62699865e
Component: engine
2015-12-26 11:42:55 +01:00
d743d1334b
Fix --storage-driver example (and --graph)
...
Signed-off-by: Chris Swan <chris.swan@iee.org >
Upstream-commit: 5eef38d364c2d850bd98c70824a67178a44d94c0
Component: engine
2015-12-24 17:02:58 +00:00
b5eef30f35
Fix --storage-driver example
...
Signed-off-by: Chris Swan <chris.swan@iee.org >
Upstream-commit: b6be4acfcc1d8801dc4250acd3701a7d3325334f
Component: engine
2015-12-24 16:43:37 +00:00
ac71b2f7e1
fixed links in Digital Ocean example
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
Upstream-commit: 3ff20fafccdce09428171511982305a180dc9928
Component: engine
2015-12-23 16:31:49 -08:00
e2277fc388
Fix typo in btrfs userguide doc
...
Signed-off-by: Samuel Dion-Girardeau <samuel.diongirardeau@gmail.com >
Upstream-commit: 63f9f2c05bd4c62dbd366f1acb97f4a0b1b52f1d
Component: engine
2015-12-23 15:10:01 -05:00
743bbc7202
remove =false from options that default to false in the docs
...
This re-aligns the docs with what the cmd line now does.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: e6115a6c1c02768898b0a47e550e6c67b433c436
Component: engine
2015-12-23 07:11:35 -08:00
6f10e6b229
Add filter for network ls to hide predefined net
...
Add filter support for `network ls` to hide predefined network,
then user can use "docker network rm `docker network ls -f type=custom`"
to delete a bundle of userdefined networks.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 26dd026bd70c9c18a16b0e339821c309e56d8ff0
Component: engine
2015-12-23 13:26:40 +08:00
663db95ac5
libnetwork vendoring
...
Vendoring libnetwork @ 9f0563ea8f430d8828553aac97161cbff4056436
Brings in:
* Support for overlay network driver in 3.10+ kernels
* Freebsd compilation fixes
* Remove .dockerinit dependency
* IPAM driver capability support
* Network internal mode support
* Misc. fixes
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: f0904affd127ea8bdebfc3f3c586f8eb38e91da5
Component: engine
2015-12-22 13:32:17 -08:00
bcd4ff1dab
Merge pull request #18837 from thaJeztah/remove-darwin-i386
...
Don't build Darwin 32-bit binaries
Upstream-commit: ff796e5bf740dba44c88132406892bf4c7050a92
Component: engine
2015-12-22 09:51:29 -08:00
89fa05b282
Update link for Weave Net plugin docs
...
Signed-off-by: Ilya Dmitrichenko <errordeveloper@gmail.com >
Upstream-commit: 45241d36d349e0802cf12a2437a732b8c8c18479
Component: engine
2015-12-22 16:45:54 +00:00
73614850c7
Don't build Darwin 32-bit binaries
...
The last 32-bit OS X computers were built in 2006,
so we probably don't need these anymore.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 814ce44d5ad442b940e44b41eff00bac0e579fc6
Component: engine
2015-12-22 00:08:18 +01:00
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
