Commit Graph

21804 Commits

Author SHA1 Message Date
563cdbee11 Merge pull request #18821 from oyld/script_fix
Fix syntax error in init script
Upstream-commit: eafecff25894cdf030f7c1994b384afce183881e
Component: engine
2015-12-22 06:48:22 -08:00
bca02abda3 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>
Upstream-commit: 6150157e8f00d957b279483a7b21e4f299318a98
Component: engine
2015-12-22 15:42:36 +01:00
03d3eb96c2 Move Victor to alumni
Victor is now a maintainer for Docker Swarm, and no
longer active as a maintainer for this repository.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ff3687c965dc544df6cbe9c4616f2aa601a13853
Component: engine
2015-12-22 15:00:21 +01:00
2d930c1a34 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>
Upstream-commit: e715daab3d531725dc4faef2265337d133bd16bc
Component: engine
2015-12-22 13:38:02 +01:00
02f28288ea Fix syntax error in init script
Signed-off-by: oyld <oyld0210@163.com>
Upstream-commit: bbbc01b86edf9a5676ad735d008097942e0a93ac
Component: engine
2015-12-22 04:00:00 -08:00
885ff722b9 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>
Upstream-commit: 8498ed73f7b35da807b5d5dcf532114c7b3df52d
Component: engine
2015-12-22 16:08:04 +08:00
8c2d6245d9 upate TestRunWithBlkioInvalidWeightDevice with clearly invalid device name
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 673f2b8697727a0f0bfb3c4bd049cdac89a5a508
Component: engine
2015-12-22 12:43:42 +08:00
ccad5598d4 When a manifest is not found, allow fallback to v1
PR #18590 caused compatibility issues with registries such as gcr.io
which support both the v1 and v2 protocols, but do not provide the same
set of images over both protocols. After #18590, pulls from these
registries would never use the v1 protocol, because of the
Docker-Distribution-Api-Version header indicating that v2 was supported.

Fix the problem by making an exception for the case where a manifest is
not found. This should allow fallback to v1 in case that image is
exposed over the v1 protocol but not the v2 protocol.

This avoids the overly aggressive fallback behavior before #18590 which
would allow protocol fallback after almost any error, but restores
interoperability with mixed v1/v2 registry setups.

Fixes #18832

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 9d6acbee92016c47796ee8751dce9c59056f850d
Component: engine
2015-12-21 18:19:38 -08: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
def74d9c92 Use of checkers in docker_cli_pull_test.go
Signed-off-by: James Carey <jecarey@us.ibm.com>
Upstream-commit: 1b010516d09fb587999eff6abb69cc76b25f7944
Component: engine
2015-12-21 14:04:38 -06:00
8ae70ed554 Merge pull request #18811 from runcom/fix-volume-debug
volume: store: store.go: fix debug message
Upstream-commit: 8537501ebd433d19eeae99664d78dc9f2cecf05c
Component: engine
2015-12-21 13:18:39 -05:00
c127109fa3 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>
Upstream-commit: 23a18b5f93b4dfbed419509589687220e5aff487
Component: engine
2015-12-21 19:14:27 +01:00
8ec62ec94b Merge pull request #18830 from calavera/tls_verify_godoc
Add godoc comment about client tls verification.
Upstream-commit: 1a8e8f2967c8f17072d4f2b43ad0c69dd6952ac8
Component: engine
2015-12-21 10:02:32 -08:00
f15d9f32b3 Merge pull request #18828 from albers/completion-plugins
Use computed plugin lists in bash completion
Upstream-commit: 88c4d4a94306f6cd6e415eb0ddd887f3fabe8a0e
Component: engine
2015-12-21 09:57:48 -08: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
141f74a2b0 Add godoc comment about client tls verification.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 4e2c0f385c3032b0b15105c81b18e3981e6e40ad
Component: engine
2015-12-21 12:55:37 -05:00
9e1ab087f5 Remove IsPaused from backend interface.
Move connection hijacking logic to the daemon.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: af94f941df9ee43b61e0e8f9d3c3b3962597eff6
Component: engine
2015-12-21 12:34:21 -05:00
3e4663395d Use computed plugin lists in bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 2033c09705dc14ea32a23a9fa78d5b7d0cac1229
Component: engine
2015-12-21 18:30:23 +01:00
e025e5f279 Merge pull request #17428 from ripcurld00d/cli_ninja_build
Change the quiet flag behavior in the build command [closes #17623]
Upstream-commit: f4ea3b2cb1d864ac6f1c7063da87b62b9191aaac
Component: engine
2015-12-21 17:59:16 +01: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
fc63a9d65d Merge pull request #18820 from vdemeester/oups-fix-api-ps-unit-tests
Fix the api/client/ps unit tests.
Upstream-commit: 67620bc0288ae7ecb12511879e6eb605e98594a1
Component: engine
2015-12-21 14:01:27 +01:00
3dcfd49f35 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>
Upstream-commit: bb853137bea8481037b88d16eeb6499b8ed63a81
Component: engine
2015-12-21 11:07:14 +01: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
a75804fa4f Merge pull request #18813 from thaJeztah/update-restart-description
(carry 18273) update description for restart policies
Upstream-commit: 4f9ed6164de03b4bfb8693c8108ef1137522aa11
Component: engine
2015-12-21 01:04:38 +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
11e1d2a63a New features in mkimage-yum.sh script
Added -g and -p options for the contrib/mkimage-yum.sh script to allow generating images with the dependencies you want. I use this because I generate images where I only need "glibc" with its dependencies or "java-1.8.0-openjdk-headless" and so on. This makes sure that I don't get a lot of bogus packages from the Core group.

Possible usages now include sudo ./mkimage-yum.sh -y yum.conf -g '' -p java-1.8.0-openjdk-headless.

Also changed the "test" at the end to add --rm parameter to docker run so it doesn't leave a junk container and use bash to echo "success" in case you don't get coreutils in your dependencies tree.

Signed-off-by: Florin Asavoaie <florin.asavoaie@gmail.com>
Upstream-commit: c8badcbd26535ff6763c724328debb1282fccb82
Component: engine
2015-12-20 14:20:30 +02: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
8c7f988b73 Merge pull request #18795 from thaJeztah/o-oracle-o-oracle-where-art-thou-oracle
Update link to Oracle Linux
Upstream-commit: fbefbc52817ce23a07a5634126abf9a12f83b7f0
Component: engine
2015-12-20 01:33:27 +01: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
36350c1926 Merge pull request #18792 from moxiegirl/fix-typo
Fixing typo reported by @projectvalis
Upstream-commit: fb879e849d6a895edab097c8feed3b5f71f33770
Component: engine
2015-12-19 22:21:41 +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
cd79f6b524 Merge pull request #18767 from wenchma/add_checkduplicate_test
Add network create api test on CheckDuplicate
Upstream-commit: 58c049595fba7cb509d8a6656ecce6389c34a5a5
Component: engine
2015-12-19 10:46:11 -05:00