Commit Graph

20796 Commits

Author SHA1 Message Date
Antonio Murdaca
ac1187dc8d Merge pull request #18844 from hqhq/hq_mv_oom_disable
Move OomKillDisable to resource
2015-12-22 18:52:24 +01: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
Jess Frazelle
b5fb5b9d00 Merge pull request #18851 from thaJeztah/update-contributing
Update contributing.md
2015-12-22 09:49:53 -08:00
Sebastiaan van Stijn
61e28f17a3 Merge pull request #18852 from errordeveloper/master
Update link for Weave Net plugin docs
2015-12-22 18:32:38 +01: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
David Calavera
5b913de5e6 Merge pull request #18847 from albers/completion-rename-functions
Better function names in bash completion
2015-12-22 08:43:08 -08:00
Tianon Gravi
eafecff258 Merge pull request #18821 from oyld/script_fix
Fix syntax error in init script
2015-12-22 06:48:22 -08:00
Sebastiaan van Stijn
6150157e8f Update contributing.md
- Add a link to the new procedures for adding maintainers
- Remove section about monthly IRC meetings, which are in flux

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-22 15:42:36 +01:00
Harald Albers
e715daab3d Better function names in bash completion
The new names make it easier to distinguish between helper functions and
functions that actually perform completion by modifying the global COMPOPT
variable.

Signed-off-by: Harald Albers <github@albersweb.de>
2015-12-22 13:38:02 +01:00
oyld
bbbc01b86e Fix syntax error in init script
Signed-off-by: oyld <oyld0210@163.com>
2015-12-22 04:00:00 -08:00
Qiang Huang
8498ed73f7 Move OomKillDisable to resource
1. It's a cgroup api, fit the general defination that we take
cgroup options as kind of resource options.
2. It's common usage and very helpful as explained here:
https://github.com/docker/docker/pull/18270#issuecomment-160561316
3. It's already in `Resource` struct in
daemon/execdriver/driver_unix.go

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-12-22 16:08:04 +08: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
Brian Goff
8537501ebd Merge pull request #18811 from runcom/fix-volume-debug
volume: store: store.go: fix debug message
2015-12-21 13:18:39 -05:00
Antonio Murdaca
23a18b5f93 volume: store: store.go: remove debug message
When driver is `local` an empty string is given to the debug message.
This patch removes the debug statement.

```
Dec 20 19:07:01 localhost.localdomain docker[19734]:
time="2015-12-20T19:07:01.872021857+01:00" level=debug msg="Registering
new volume reference: driver , name
c2291b964b4d7b1b51ec51d2ccfe2544f83fd23404709225a43743c5faadad55"
```

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-21 19:14:27 +01:00
Alexander Morozov
1a8e8f2967 Merge pull request #18830 from calavera/tls_verify_godoc
Add godoc comment about client tls verification.
2015-12-21 10:02:32 -08:00
David Calavera
88c4d4a943 Merge pull request #18828 from albers/completion-plugins
Use computed plugin lists in bash completion
2015-12-21 09:57:48 -08: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
David Calavera
4e2c0f385c Add godoc comment about client tls verification.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-21 12:55:37 -05:00
Harald Albers
2033c09705 Use computed plugin lists in bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
2015-12-21 18:30:23 +01:00
Sebastiaan van Stijn
f4ea3b2cb1 Merge pull request #17428 from ripcurld00d/cli_ninja_build
Change the quiet flag behavior in the build command [closes #17623]
2015-12-21 17:59:16 +01: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
67620bc028 Merge pull request #18820 from vdemeester/oups-fix-api-ps-unit-tests
Fix the api/client/ps unit tests.
2015-12-21 14:01:27 +01:00
Vincent Demeester
bb853137be Fix the api/client/ps unit tests.
TestFormat was depending on the time so (comparing again
1970-01-01).. at some point it was bounded to fail >_<. Updating it to
be *not* time-dependent :).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-12-21 11:07:14 +01: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
Sebastiaan van Stijn
4f9ed6164d Merge pull request #18813 from thaJeztah/update-restart-description
(carry 18273) update description for restart policies
2015-12-21 01:04:38 +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
fbefbc5281 Merge pull request #18795 from thaJeztah/o-oracle-o-oracle-where-art-thou-oracle
Update link to Oracle Linux
2015-12-20 01:33:27 +01: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
Sebastiaan van Stijn
fb879e849d Merge pull request #18792 from moxiegirl/fix-typo
Fixing typo reported by @projectvalis
2015-12-19 22:21:41 +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
Doug Davis
58c049595f Merge pull request #18767 from wenchma/add_checkduplicate_test
Add network create api test on CheckDuplicate
2015-12-19 10:46:11 -05:00