Commit Graph

26758 Commits

Author SHA1 Message Date
fc88fcd016 Revendor swarmkit to 2eaae1ab6800f8521236e01bafb2667d2ec5371f
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: 014eeb539beaf84c69dc2a97b8ffd32551219d0e
Component: engine
2016-11-04 12:26:37 -07:00
9dcd59a93e Revendor go-memdb to floridoo/go-memdb's fork (608dda3b1410a73eaf3ac8b517c9ae7ebab6aa87)
We are temporarily using a fork containing a PR that hasn't been merged
upstream yet.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: 9322636c8926f155a10d9679e364e3f8e86203d6
Component: engine
2016-11-04 12:26:37 -07:00
a4610ccc0a Merge pull request #28064 from lixiaobing10051267/masterInstallation
modify URL because installation directory removed
Upstream-commit: da499758b8f4fd96213889964ca206b2396bed48
Component: engine
2016-11-04 12:06:37 -07:00
44dc3f21c6 Merge pull request #28072 from Microsoft/jjh/api124
Windows: Allow API v1.24
Upstream-commit: 24d822d179df9a7ab668d280efbd64a8b1735fe2
Component: engine
2016-11-04 11:57:42 -07:00
cee03f5dd3 Merge pull request #28073 from albers/completion-service-create--hostname
Add bash completion for `docker service create --hostname`
Upstream-commit: c859a9ff1fe6a1caa384c012bc007ab601e50ed7
Component: engine
2016-11-04 11:57:08 -07:00
20a1f51ba7 Merge pull request #28057 from aaronlehmann/lint-api
Run lint on most of api/types
Upstream-commit: ab2593457991fa037346544b91d0bdb64963d5e2
Component: engine
2016-11-04 11:56:02 -07:00
889abdab10 Add bash completion for docker service create --hostname
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 42f8562984809b26bbae541cc005e36a2febc1cb
Component: engine
2016-11-04 19:08:17 +01:00
46c5a7990c Windows: Allow API v1.24
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: e4af39aeb311a08fd2d15e01eabd6bae9db36382
Component: engine
2016-11-04 10:10:42 -07:00
133eec9cfa Add --cpus flag to control cpu resources
This fix tries to address the proposal raised in 27921 and add
`--cpus` flag for `docker run/create`.

Basically, `--cpus` will allow user to specify a number (possibly partial)
about how many CPUs the container will use. For example, on a 2-CPU system
`--cpus 1.5` means the container will take 75% (1.5/2) of the CPU share.

This fix adds a `NanoCPUs` field to `HostConfig` since swarmkit alreay
have a concept of NanoCPUs for tasks. The `--cpus` flag will translate
the number into reused `NanoCPUs` to be consistent.

This fix adds integration tests to cover the changes.

Related docs (`docker run` and Remote APIs) have been updated.

This fix fixes 27921.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 846baf1fd3efcbfbf9d3eb99e436ca9a59d3e185
Component: engine
2016-11-04 09:43:10 -07:00
71fb2940a4 Merge pull request #26276 from runcom/seccomp-conf
daemon: add a flag to override the default seccomp profile
Upstream-commit: efa5e85cf7c6d91fbc8003770fee14bd716a2fdd
Component: engine
2016-11-04 15:45:30 +00:00
bf52c4c327 Merge pull request #27857 from vasil-yordanov/docker-service-hostname-2
Adding the hostname option to docker service command
Upstream-commit: b4e14c6edcd201f0b5fade154714218a41005d77
Component: engine
2016-11-04 15:22:55 +01:00
92845e354d modify URL because installation directory removed
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 56cca9292252efbcecad69fc965d63d99fda5e5e
Component: engine
2016-11-04 16:40:15 +08:00
1931090ba1 Merge pull request #28045 from vincentbernat/fix/inspect-short-description
cli: shorten description of "inspect" subcommand
Upstream-commit: 16bcc1afddd83de27e22ac519af62280a968534b
Component: engine
2016-11-04 08:15:49 +01:00
930e01c1dd Merge pull request #28035 from thaJeztah/add-test-for-long-loglines
add tests for long log-lines and trailing lines
Upstream-commit: 9f7cc7d0320b93236169a7e0f6f9d69fa8c91bb8
Component: engine
2016-11-04 07:59:20 +01:00
c5466cbef3 Run lint on most of api/types
The validate-lint script excludes any package names that match
api/types. However, the only subpackage that appears to cause issues is
api/types/container (due to stuttering names). Tighten the filtering so
that other code inside api/types is validated.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: efa7068133f224386dbcceb19a6dd31d1d2e9404
Component: engine
2016-11-03 19:08:24 -07:00
7379675f65 Merge pull request #27912 from LK4D4/vndr
project: use vndr for vendoring
Upstream-commit: c07234707878412eaaeab252af19adac8cf25d6b
Component: engine
2016-11-03 18:30:19 -07:00
4fb898db56 Merge pull request #28052 from mavenugo/nid
Handle NetworkDettach for the case of network-id
Upstream-commit: 7248742ae7127347a52ab9d215451c213b7b59da
Component: engine
2016-11-03 21:00:37 -04:00
ba87ff5ff2 Merge pull request #28046 from tophj-ibm/make-debs-1610
[ppc64le] add yakkety yak to 'make deb'
Upstream-commit: d5c3eb0afb9ccbdb671c4841727bab87a4bb2145
Component: engine
2016-11-03 20:17:36 -04:00
a512b3ec7d Merge pull request #28000 from riyazdf/revert-27804
Revert "Update authz plugin list on failure."
Upstream-commit: 2793f198deb86e250e769b97fe5a1a729b829ce6
Component: engine
2016-11-03 17:17:22 -07:00
69698a95a6 Merge pull request #28053 from gdevillele/pr_fix_docs_frontmatter_keywords_2
fix frontmatter keywords value type (string, instead of []string) in /docs/reference/
Upstream-commit: a89f8f2d9318984dedc291cea8dca6fecf50c9e5
Component: engine
2016-11-03 17:16:40 -07:00
ca48f39ec7 Merge pull request #28049 from gdevillele/pr_fix_docs_frontmatter_keywords
fix frontmatter keywords value type (string, instead of []string)
Upstream-commit: 8956853398fc30b08897f6da239d95e0a39ed782
Component: engine
2016-11-03 17:14:11 -07:00
105f733caf Merge pull request #26792 from mrunalp/bug/26790
Add SELinux options to security opt even when it is not empty
Upstream-commit: 58a930d66b7cada1fbc2490c10890fdc56b4d053
Component: engine
2016-11-03 17:04:36 -07:00
8ef82a0e0b Merge pull request #28021 from YuPengZTE/devString
Add “” for String
Upstream-commit: 6b3b9d53e1cb0db90d3e25881fcf1e225179040e
Component: engine
2016-11-03 17:03:56 -07:00
ac87aff1ce Merge pull request #27707 from FrenchBen/aws-logstream
Aws logstream
Upstream-commit: f424b1d8845e8d9c55f379df979ed63eee923a2a
Component: engine
2016-11-03 16:16:02 -07:00
c790a14c2d Handle NetworkDettach for the case of network-id
When a container is attached to an "--attachable" network, it strictly
forms the attacherKey using either the network-id or network-name
because at the time of attachment, the daemon may not have the network
downloaded locally from the manager. Hence, when the NetworkDettach is
called, it should use either network-name or network-id. This fix
addresses the missing network-id based dettachment case.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 5f17e0f6c91b36a8f33d1efa1be879d6eb80132f
Component: engine
2016-11-03 15:56:35 -07:00
abdf1bbec3 Revert "Update authz plugin list on failure."
This reverts commit fae904af02a184833d2cd5ce9fdd61a4083707c7.

Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: a64fc8eea3266968c8e0082dbe6a2f5a8a5bbdc0
Component: engine
2016-11-03 15:49:21 -07:00
062414bb0e fix frontmatter keywords value type (string, instead of []string) in /docs/reference
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
Upstream-commit: 248c699ec88bb249ce9fd03001d13f29ac0b4b99
Component: engine
2016-11-03 15:48:30 -07:00
61646d77af project: use vndr for vendoring
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: f2614f2107c838d014d31b806e3b8a9f1395cb2b
Component: engine
2016-11-03 15:31:46 -07:00
45ef7232e4 Merge pull request #27964 from dnephin/faster-validate
Faster validation scripts
Upstream-commit: f54339dfead48712857d38b6a4ff7f45717a7074
Component: engine
2016-11-03 15:17:34 -07:00
77b454e708 Merge pull request #28044 from tophj-ibm/update-ppc64le-make-deb
[ppc64le] update go download link, and improve comments
Upstream-commit: 98c3e0c929f8b68707846cfeead894e0a8a81df1
Component: engine
2016-11-03 14:42:32 -07:00
d522560d52 Merge pull request #28019 from sanimej/vendor
Vendoring libnetwork @9ab6e13
Upstream-commit: 2d676d38a0d69ee2f4b126e8fcd48c830ee3796b
Component: engine
2016-11-03 14:35:28 -07:00
95b3cc2f00 fix frontmatter keywords value type (string, instead of []string)
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
Upstream-commit: 4aa6618acb92cd5453c0245e2f4cc8022a2398f7
Component: engine
2016-11-03 14:21:33 -07:00
069eefcf38 Updated AWS logstream to understand tags
Signed-off-by: French Ben <frenchben@docker.com>
Upstream-commit: 3661510f7f9f389f25a6d6a065509ae224372994
Component: engine
2016-11-03 13:49:40 -07:00
362409ed3f Merge pull request #27331 from Microsoft/jjh/spew
Add spew debugging
Upstream-commit: 02bc2e652b2a254a1afcc66cb32827fa0e65a6fa
Component: engine
2016-11-03 16:36:20 -04:00
1747fa824e Add stubs for windows CI
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 9a2eb8b162e4df0533aeafc2e8d7bb9bbadb8234
Component: engine
2016-11-03 14:24:58 -06:00
dd0403a2eb Move validation out of hack/make
Allow each script to run directly without the hack/make.sh wrapper. These
scripts do not produce artifacts and do not benefit from the "bundles"
framework.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 22033e10034884734621f185b60ddaa119014480
Component: engine
2016-11-03 14:24:22 -06:00
a3ad26e4b1 Ensure that SELinux Options are set when seccomp is already set
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
Upstream-commit: 4c10c2ded38031b20f5a0a409dd24643625fa878
Component: engine
2016-11-03 13:23:53 -07:00
d7dd3c497e Merge pull request #27383 from runcom/authz-peercerts
pkg/authorization: send request's TLS peer certificates to plugins
Upstream-commit: 16f6b3e8a9f22df5cbd3454f6e68a8be7e5f04cf
Component: engine
2016-11-03 13:22:29 -07:00
45efa44b4f [ppc64le] add yakkety yak to 'make deb'
This adds 'make deb' support for yakkety yak on ppc64le

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: da382044d3630bcdeb1eac64f2f7ad476e0cf007
Component: engine
2016-11-03 15:59:59 -04:00
b3ef6232b4 cli: shorten description of "inspect" subcommand
The short description should be kept short. Spanning on several lines is
a bit ugly. A user can still get more information in the manual or we
can expand the long description instead if we want (there is currently
none).

This reverts a bit of #26683.

Signed-off-by: Vincent Bernat <vincent@bernat.im>
Upstream-commit: 3443668e044476869227295a0aabb65c50fdd3ef
Component: engine
2016-11-03 20:46:28 +01:00
dc399e49f2 [ppc64le] update make deb go download link
Updates the ppc64le `make deb` trusty download link to be
consistent with the other Dockerfiles. Also minor clarification
to how we install go.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 629e85ad8975046eba3a88fdc8448759525e27bd
Component: engine
2016-11-03 15:26:28 -04:00
1b35413a33 Fix IT case for network name validation
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: 9cebccfb95b75e7688b897d74c1eee9eb668526f
Component: engine
2016-11-03 11:04:37 -07:00
2a3ba6c702 Vendoring libnetwork @9ab6e13
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: 8479a765dd5b4b56acd0815135d201bc98b3709a
Component: engine
2016-11-03 10:58:47 -07:00
bff4ddec3e fix double [y/N] in container prune
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: eadb5b315be2ca51aa59ce55ef34478fbdceefa2
Component: engine
2016-11-03 10:33:17 -07:00
6477b96f99 Merge pull request #27910 from dperny/node_ip_in_raft
Auto-detect node IP address 
Upstream-commit: b2641bd9df5c2511f9af5c811590617884c24a0f
Component: engine
2016-11-03 10:30:55 -07:00
6483cebb58 Merge pull request #27873 from duglin/fixContChar
Fix case where \ at EOF made the builder ignore the command
Upstream-commit: ecf405b64de82bbf565bce6e4610c04a29113958
Component: engine
2016-11-03 10:30:15 -07:00
ed09e04a52 Merge pull request #27164 from cpuguy83/carry_24205
Fix volume creates blocked by stale cache entries
Upstream-commit: cf55397e130e6ab04ad723ef014cf49a3b62998e
Component: engine
2016-11-03 10:28:13 -07:00
f6fb29849a Merge pull request #27968 from vieux/add_volume_test
add test plugin install --disable and volume ls
Upstream-commit: 6ee25e6277c930c71ff0e5c68ec6d66845b7f88f
Component: engine
2016-11-03 10:22:52 -07:00
a8f159283e Spew debugging
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 4c62b1263648833122828cf8cc8259f5b7e32da5
Component: engine
2016-11-03 10:05:11 -07:00
f08ca94e09 add tests for long log-lines and trailing lines
this adds new tests to test logging of long log-lines
(without newlines), and trailing log-lines.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ee34dd9f8a8a0246dae94385ed2ca56691085842
Component: engine
2016-11-03 10:01:00 -07:00