Sebastiaan van Stijn
2c3d1a9b12
Merge pull request #18964 from hqhq/hq_fix_memory_swap_doc2
...
Fix docs for memory-swap
2015-12-30 21:01:48 +01:00
Sebastiaan van Stijn
3b605b5926
Merge pull request #18764 from donovan/fix-networkingcontainers-ip-addresses
...
fix incorrect ip addresses in networkingcontainers
2015-12-30 17:49:08 +01:00
Qiang Huang
c68a483e44
Fix docs for memory-swap
...
Fixes : #18894
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-12-30 09:23:35 +08:00
moxiegirl
de84dfba75
Merge pull request #18627 from londoncalling/cloud-installs
...
[WIP] docs updates per issue 18282 cloud installs
2015-12-29 14:54:18 -08:00
Thomas Swift
c44a8d8d8c
Fix typo in daemon storage-driver docs
...
Signed-off-by: Thomas Swift <tgs242@gmail.com>
2015-12-29 17:06:02 -05:00
David Calavera
78ce43bad8
Merge pull request #18780 from jfrazelle/seccomp-default
...
set default seccomp profile
2015-12-28 16:46:30 -08:00
J Bruni
153948ac46
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>
2015-12-28 20:57:36 -02:00
Sebastiaan van Stijn
8c6ad0991e
Merge pull request #18899 from cpswan/18898-fix-storage-driver-example
...
Fix --storage-driver example
2015-12-28 21:58:43 +01:00
Jessica Frazelle
15674c5fb7
add docs and unconfined to run a container without the default seccomp profile
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-28 10:26:51 -08:00
David Calavera
8669ea01ba
Merge pull request #15078 from hqhq/hq_add_set_api_v2
...
Implement docker update command
2015-12-28 08:55:32 -08:00
Qiang Huang
8799c4fc0f
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>
2015-12-28 19:19:26 +08:00
Aditi Rajagopal
8134a562c6
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>
2015-12-26 19:02:20 -05:00
Sebastiaan van Stijn
d4270c1764
Merge pull request #18775 from mrjana/mh
...
libnetwork vendoring
2015-12-26 11:42:55 +01:00
Chris Swan
5eef38d364
Fix --storage-driver example (and --graph)
...
Signed-off-by: Chris Swan <chris.swan@iee.org>
2015-12-24 17:02:58 +00:00
Chris Swan
b6be4acfcc
Fix --storage-driver example
...
Signed-off-by: Chris Swan <chris.swan@iee.org>
2015-12-24 16:43:37 +00:00
Victoria Bialas
3ff20fafcc
fixed links in Digital Ocean example
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2015-12-23 16:31:49 -08:00
Samuel Dion-Girardeau
63f9f2c05b
Fix typo in btrfs userguide doc
...
Signed-off-by: Samuel Dion-Girardeau <samuel.diongirardeau@gmail.com>
2015-12-23 15:10:01 -05:00
Doug Davis
e6115a6c1c
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>
2015-12-23 07:11:35 -08:00
Zhang Wei
26dd026bd7
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>
2015-12-23 13:26:40 +08:00
Jana Radhakrishnan
f0904affd1
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>
2015-12-22 13:32:17 -08:00
Jess Frazelle
ff796e5bf7
Merge pull request #18837 from thaJeztah/remove-darwin-i386
...
Don't build Darwin 32-bit binaries
2015-12-22 09:51:29 -08:00
Ilya Dmitrichenko
45241d36d3
Update link for Weave Net plugin docs
...
Signed-off-by: Ilya Dmitrichenko <errordeveloper@gmail.com>
2015-12-22 16:45:54 +00:00
Sebastiaan van Stijn
814ce44d5a
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>
2015-12-22 00:08:18 +01:00
Sebastiaan van Stijn
312c82677b
Merge pull request #15879 from Mashimiao/add-support-blkio_throtte_iops
...
Add support for blkio read/write iops device
2015-12-21 23:45:18 +01:00
Vincent Demeester
eff810aed6
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
2015-12-21 22:02:18 +01:00
Alexander Morozov
42460b6772
Merge pull request #17692 from vdemeester/images-format
...
Add --format support to images command
2015-12-21 09:57:29 -08:00
Vincent Demeester
34a3c3cacf
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>
2015-12-21 17:38:07 +01:00
Boaz Shuster
60b4db7eb1
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>
2015-12-21 16:38:50 +02:00
Sebastiaan van Stijn
6d04d9cda8
Merge pull request #18804 from mqliang/patch-6
...
Update selectadriver.md
2015-12-21 09:56:05 +01:00
mqliang
41c2dab459
update document
...
Signed-off-by: mqliang <mqliang.zju@gmail.com>
2015-12-21 11:53:38 +08:00
Ma Shimiao
843084b08b
Add support for blkio read/write iops device
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-12-21 09:14:49 +08:00
Sebastiaan van Stijn
e9f72410ae
Merge pull request #18798 from mqliang/patch-1
...
Update dockervolumes.md
2015-12-21 01:09:52 +01:00
Sebastiaan van Stijn
83f28cb374
Merge pull request #18801 from mqliang/patch-3
...
Update index.md
2015-12-21 01:08:58 +01:00
Aidan Feldman
c32ec8b93b
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>
2015-12-21 00:58:30 +01:00
moxiegirl
91b56a7c26
Merge pull request #18790 from tbonza/master
...
updated fedora yum to dnf package manager
2015-12-20 08:46:31 -08:00
Sebastiaan van Stijn
9f306364f5
Merge pull request #18806 from mqliang/patch-8
...
Update btrfs-driver.md
2015-12-20 17:24:29 +01:00
Liang Mingqiang
3dd90e564c
Update dockervolumes.md
...
Signed-off-by: mqliang mqliang.zju@gmail.com
Signed-off-by: lmq <mqliang@lmqs-MacBook-Pro.local>
2015-12-20 23:41:00 +08:00
Liang Mingqiang
8737896e42
Update btrfs-driver.md
...
Signed-off-by: lmq <mqliang@lmqs-MacBook-Pro.local>
2015-12-20 23:08:01 +08:00
Sebastiaan van Stijn
325b1f35ae
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>
2015-12-20 16:00:53 +01:00
Liang Mingqiang
38ee016966
Update index.md
...
fix typo in document
Signed-off-by: mqliang mqliang.zju@gmail.com
Signed-off-by: lmq <mqliang@lmqs-MacBook-Pro.local>
2015-12-20 23:00:38 +08:00
Antonio Murdaca
cc6f0df2e4
Merge pull request #18794 from thaJeztah/EOL-fedora-21
...
Remove Fedora 21 from RPM build as it is EOL
2015-12-20 11:53:51 +01:00
moxiegirl
18925f37ed
Merge pull request #18707 from runcom/update-labels-doc-for-emtpy-lables
...
update syntax for empty value labels
2015-12-19 21:53:21 -08:00
moxiegirl
3d43ebebfa
Merge pull request #18720 from kytrinyx/unspecific-ubuntu
...
docs: remove ubuntu version in dockerizing userguide
2015-12-19 21:17:38 -08:00
moxiegirl
fa720ad987
Merge pull request #18667 from bboreham/inspect-json-doc
...
Improved explanation of docker inspect 'json' function
2015-12-19 21:09:39 -08:00
Sebastiaan van Stijn
579d35e33c
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>
2015-12-20 00:52:12 +01:00
Sebastiaan van Stijn
a08c955e30
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>
2015-12-20 00:42:17 +01:00
Mary Anthony
55a65e18c0
Fixing typo reported by @projectvalis
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-12-19 12:47:24 -08:00
tbonza
0635403536
updated fedora yum to dnf package manager Signed-off-by: Tyler Brown <tylers.pile@gmail.com>
2015-12-19 15:04:19 -05:00
Sebastiaan van Stijn
69fbdf4294
Merge pull request #18684 from cdauth/volume-docs
...
Add note to volume docs that data is not copied to mounted volumes
2015-12-19 15:29:44 +01:00
Sebastiaan van Stijn
eaf7932faf
Merge pull request #18769 from runcom/docs-auth-1
...
docs: extend: authorization.md: add a note about confidential stuff in Err
2015-12-19 14:53:25 +01:00