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
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
373f6a5b36
Merge pull request #28040 from vieux/fix_prune_container_msg
...
fix double [y/N] in container prune
Upstream-commit: e9158358e5cf227688aaf4529625395559d6bb2d
Component: engine
2016-11-03 13:19:10 -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
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
ec058523ee
Vendor davecgh/gospew @ 6d212880
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 3b6cd20b0b123a48cb3a484f194b9ec83d1d0568
Component: engine
2016-11-03 09:35:58 -07:00
bdd83cf850
Fix volume creates blocked by stale cache entries
...
When a conflict is found in the volume cache, check with the driver if
that volume still actually exists.
If the volume doesn't exist, purge it from the cache and allow the
create to happen.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 6a0bdffc1adf9225c6cca92f741ccafd2f90a618
Component: engine
2016-11-03 11:56:44 -04:00
e82a3896c3
Merge pull request #27599 from estesp/getent-path
...
Add support for looking up user/groups via `getent`
Upstream-commit: 81683e898a53a7bcbcb0e812db640173c3895c28
Component: engine
2016-11-03 15:11:42 +00:00
e11e25579b
added node ip autodetection
...
Manager now auto-detects the address that an agent connects to the cluster
from and stores it. This is useful for many kinds of internal cluster
management tools.
Signed-off-by: Drew Erny <drew.erny@docker.com >
Upstream-commit: 9bcf623719104fbd196ab0ca14af48f790980499
Component: engine
2016-11-03 08:10:14 -07:00
d1279f3328
Fix case where \\ at EOF made the builder ignore the command
...
Came from looking at issue #27545
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: eaf0b5708fc91ab0c78eeee1a2c9c1251439d4a8
Component: engine
2016-11-03 05:48:49 -07:00
19febb4ca7
Merge pull request #27934 from yuexiao-wang/volume-create
...
Update descriptions for the docker volume sub-command, such as create，list and inspect
Upstream-commit: aa90a531c598af4ace14ee9e96021743fe4cff2e
Component: engine
2016-11-03 03:12:10 -07:00
bb59ba04f3
Update for docker volume create
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: cf5fadeb0c8d1c08c0f7f59e9d530776c92c728a
Component: engine
2016-11-03 22:40:04 +08:00
9f21bdfa4b
Merge pull request #26825 from AkihiroSuda/mountcli
...
cli: add `--mount` to `docker run`
Upstream-commit: e93f84a48bb394ed181aa48d9400922b292eb15a
Component: engine
2016-11-03 03:11:44 -07:00
d70c70756d
Add for String
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn >
Upstream-commit: 167daf5060e75a597d70fd7240d59d34b160f8ef
Component: engine
2016-11-03 16:15:26 +08:00
5e989e429c
Merge pull request #27951 from LK4D4/dump_always_to_file
...
daemon: always dump stack to file
Upstream-commit: 19b5b4aada27e85fc888a576e90aee626bc8bcfa
Component: engine
2016-11-03 00:35:06 -07:00
2213e9bb9f
cli: add --mount to docker run
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 273eeb813c1db0f42c2ad5e053972eeb00907568
Component: engine
2016-11-03 07:08:59 +00:00
f396f287a0
Merge pull request #28016 from thaJeztah/dont-include-powershell-in-tgz
...
Don't include PowerShell completions in tgz
Upstream-commit: 0f9ba0ea709bacce4ba321c613ad97db0838d2f9
Component: engine
2016-11-02 23:32:48 -07:00
fb8fd8dbba
Merge pull request #28006 from dmcgowan/clean-overlay2-layerstore
...
Cleanup invalid code in overlay2 and layer store
Upstream-commit: 1f4137857f6eb8edcbefe591e1abe04d83da3416
Component: engine
2016-11-02 23:16:38 -07:00
a35b88e218
Merge pull request #27889 from Microsoft/jjh/windockerfile
...
Windows: dockerfile tweaks
Upstream-commit: 5c9e38b73f4f5b6f2984436f6defd74a1eea9c9c
Component: engine
2016-11-02 23:08:27 -07:00
