7b053bbb81
Merge pull request #27149 from swernli/servicing_fix
...
Fixing servicing bug by always specifying LayerFolderPath
Upstream-commit: 33ae7d4c195d9096def013fcd4af32df3c2f4606
Component: engine
2016-10-05 13:21:47 -07:00
391b6f94da
Merge pull request #26509 from LK4D4/commits_from_vendor
...
project: move go binaries installation to separate script
Upstream-commit: 0b86ca9ad0916b62b7429f5d15821962bc4f7db0
Component: engine
2016-10-05 13:15:30 -07:00
866c5e6688
Merge pull request #27037 from Microsoft/jjh/apistatsdatarace
...
Fix datarace in ApiStatsNetworkStatsVersioning
Upstream-commit: ba9fb732801cfdcd55dd2a4cfce5ef5e0962fc59
Component: engine
2016-10-05 13:06:40 -07:00
2e8039dc97
Merge pull request #25837 from reaperhulk/support-compressing-build-context
...
Add support for compressing build context during image build
Upstream-commit: f08a450ad35706900766e7766d30a90d688e410b
Component: engine
2016-10-05 12:57:46 -07:00
01ea3265f2
Merge pull request #27039 from rojingeorge/patch-1
...
Updating the DockerFile for build failure, when make build is done, f…
Upstream-commit: aa8996f70b55d23e436c353a0cf439c17427cabd
Component: engine
2016-10-05 10:51:42 -07:00
ff392389fd
Fix datarace in ApiStatsnetworkStatsVersioning
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 825e3a66a419038600024be7dfc5ca24426444f0
Component: engine
2016-10-05 10:12:46 -07:00
c735d7ed2f
Merge pull request #27038 from jstarks/non_base_utilityvm
...
Windows: support Windows servicing layers
Upstream-commit: 214b70e6ef9c5430c48cd88303f4cc0574e0037a
Component: engine
2016-10-05 10:02:31 -07:00
88b23f378f
Merge pull request #27146 from duglin/fixCont
...
Require continuation char to be last char in a line
Upstream-commit: 67155f1c33627b6596c448ed5b0214085059858d
Component: engine
2016-10-05 09:49:47 -07:00
a8b06cb6d8
Merge pull request #27153 from vieux/awscli_arm
...
add awscli to arm Dockerfile
Upstream-commit: 2616a909e8c0d2e6558e441bd8be9d29ca43f3cc
Component: engine
2016-10-05 07:29:36 -07:00
ad7e3acff8
Merge pull request #27154 from pwzgorilla/master
...
typo: modified `Server` as `Serve`
Upstream-commit: ed72c65a2a608957f8fe0b978755b705209c6a73
Component: engine
2016-10-05 07:03:18 -04:00
2b32e2d2c1
Merge pull request #27156 from rheinwein/lf/update-installation-link
...
Update experimental/README link to binary installation instructions
Upstream-commit: 5a2c19ac4af42d800d8af8ad46de8fe112e03848
Component: engine
2016-10-05 12:23:46 +02:00
fbb94af7cf
Merge pull request #27042 from mlaventure/remove-ubuntu-wily
...
Remove Ubuntu 15.10 (Wily Werewolf) from build-deb targets
Upstream-commit: d4b8bf49ddb43d148a07414920bbf6f46b56ba72
Component: engine
2016-10-05 12:19:05 +02:00
13526e8517
Merge pull request #27139 from runcom/fix-WriteJSON
...
api/server/httputils: compile with go < 1.7 (WriteJSON)
Upstream-commit: 5a1efde8f2649171f8bf820704665fccecf9bcdf
Component: engine
2016-10-05 12:15:04 +02:00
7fc866cf3e
Update readme link to binary installation instructions
...
Signed-off-by: Laura Frank <ljfrank@gmail.com >
Upstream-commit: 65e110378906bb7a7594484a764a795b2b45f0eb
Component: engine
2016-10-05 11:13:08 +02:00
6ee0f7a61c
typo: modified Server as Serve
...
Signed-off-by: mgniu <mgniu@dataman-inc.com >
Upstream-commit: 97a4548bb3ff45f5f965e2b92f4eea426c01bd5b
Component: engine
2016-10-05 12:20:31 +08:00
546bf84a57
Merge pull request #27152 from darrenstahlmsft/Rounding
...
Windows: fix rounding error in container resources
Upstream-commit: c48317ad7ca4eebe7f84cab6075707493eb7c567
Component: engine
2016-10-04 21:08:14 -04:00
64a1b4f929
add awscli to arm Dockerfile
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: dbec45fa7a97ff62be279d67f52d734da3fae55f
Component: engine
2016-10-04 16:22:59 -07:00
4ab9943ca0
Fixing servicing bug by always specifying LayerFolderPath
...
During the recent OCI changes, I mistakenly thought LayerFolderPath is only needed for Windows Server containers (isolation=process) and not for Hyper-V Containers, but it turns out it is also required for servicing containers used to finish installing updates. Since the servicing containers need to reuse the container's create options, this change makes it so that LayerFolderPath is always filled in for all containers as part of constructing the create options.
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
Upstream-commit: 78540d0d181d581342b0a2750786ae91e6ed9f91
Component: engine
2016-10-04 15:29:30 -07:00
2c7a91b704
Windows: fix rounding error in container resources
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 1b48203f179e2e469d0fb1963dba0b2376f53eb0
Component: engine
2016-10-04 14:11:32 -07:00
94417a16f4
Remove Ubuntu 15.10 (Wily Werewolf) from build-deb targets
...
As of July 28, 2016, it is officially EOL (https://lists.ubuntu.com/archives/ubuntu-announce/2016-July/000210.html ) and will receive no further updates.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: e9a81057086cf9834cce4c49c6f8ef035938fc64
Component: engine
2016-10-04 13:01:00 -07:00
6435f4aeaf
Merge pull request #27148 from anusha-ragunathan/chg_import_path
...
Add plugingetter to pkg.
Upstream-commit: e097c2a938c76734240d90ddc15a83ad3699d3a5
Component: engine
2016-10-04 15:17:08 -04:00
7ec53d01f4
Add plugingetter to pkg.
...
plugingetter is indepedent of docker/docker packages, so it can be
moved to pkg. This is also necessary for authorization plugins (part of
pkg) to use pluginv2. The original path at plugin/getter will be
eventually removed, when external repos (eg. libnetwork) update their
import paths.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: d599d53db27f4a24b18f51464c39707eae383c7e
Component: engine
2016-10-04 12:03:29 -07:00
5bbd3d9214
Require continuation char to be last char in a line
...
While look at #27039 I noticed that we allow for whitespace after
the continuation char (\\) which is wrong. It needs to be the very
last char in the line.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 105bc63295a7126798d3722a0e205c5ead4e2b1c
Component: engine
2016-10-04 09:38:00 -07:00
19c07b3df2
Merge pull request #26989 from aboch/none
...
Respect --bridge=none
Upstream-commit: 694ba71e365c6b9aa7472a9ef29bbde3cba6dce2
Component: engine
2016-10-04 16:25:39 +02:00
6d8d7fa57b
Merge pull request #27136 from allencloud/add-lock-in-libcontainerd
...
add lock in libcontainerd client AddProcess of Windows
Upstream-commit: 5e072a25f80f13028fdb86df4179a8ee60cbde90
Component: engine
2016-10-04 09:29:59 -04:00
aaee5183a9
api/server/httputils: compile with go < 1.7
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: d1d505fa701bfe28a59afee8158994cf33ef043c
Component: engine
2016-10-04 12:01:49 +02:00
43c9d470cf
add lock in libcontainerd client AddProcess of Windows
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 5143be0ccf70c7cb2acc2aa39fd7ec47450e5daa
Component: engine
2016-10-04 10:29:21 +08:00
c99a6c9099
Merge pull request #26860 from anusha-ragunathan/nw-pv2
...
Make libnetwork use pluginv2.
Upstream-commit: 0cc7f0185f59f9271b7b783b776dac74347e8f51
Component: engine
2016-10-03 17:12:16 -07:00
b81765ad80
Merge pull request #27128 from anusha-ragunathan/plugin-shutdown
...
Shutdown plugins after containers.
Upstream-commit: 671d01aabf7ebeb1589c5cbdabb769ac09da52b9
Component: engine
2016-10-03 17:08:22 -07:00
881be51ddf
Merge pull request #27121 from LK4D4/fix_import
...
volume/local: fix import path
Upstream-commit: f60727d1853299216b573ca7e2975020a74e4055
Component: engine
2016-10-03 16:48:20 -07:00
b99e1dad7a
Merge pull request #27126 from mlaventure/fix-tgz
...
Remove amd64 assumption in release.sh, cross and tgz scripts
Upstream-commit: bd57e6d25c2c9d41a6cf2c9931606f58bb66a07d
Component: engine
2016-10-03 16:03:00 -07:00
543881c701
Shutdown plugins after containers.
...
Fixes #26278
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: ed6e30767e27537ce342baa17659d983a76c5b7e
Component: engine
2016-10-03 15:52:44 -07:00
6885c18aa4
Remove amd64 assumption in release.sh, cross and tgz scripts
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 61335bcb03ac60385bc19b6e1346b34cd168f7de
Component: engine
2016-10-03 15:46:42 -07:00
a5f310019c
volume/local: fix import path
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 5af8cfd3b16b6bc1754537fb5424365839ad2fc4
Component: engine
2016-10-03 12:13:56 -07:00
bc1c43e903
Respect --bridge=none
...
- Do not create the default "bridge" network
- Get rid of the docker0 bridge
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: a0af884d3a499460bdb8b41bc7cd61b1a56e6d22
Component: engine
2016-10-03 11:08:34 -07:00
750c4cf157
Windows: Revendor hcsshim v0.4.5
...
This update adds support for non-base layers that have utility VM updates
and hard links. This is necessary to support Microsoft-released layers
with servicing updates.
Signed-off-by: John Starks <jostarks@microsoft.com >
Upstream-commit: cab70c391f465905de2e2c5bd844c181c3c9a01b
Component: engine
2016-10-03 11:00:04 -07:00
a56e5f9c6c
Vendor docker/swarmkit changes.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 009f74135123c785783349358d5ad69aa0992305
Component: engine
2016-10-03 10:59:38 -07:00
8ca73d18af
Initialize libnetwork and IPAMDriver with pluginstore.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: a00940f02c2699c091ebffb47f4c2d7f14f284d9
Component: engine
2016-10-03 10:40:05 -07:00
3b8c0feef0
Vendor in docker/libnetwork.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 2b0f0d0d711cf64233d984a02287c2167ce2d6c3
Component: engine
2016-10-03 10:40:05 -07:00
4c9f39efcc
Merge pull request #26967 from AkihiroSuda/rename-tests
...
[nit] integration-cli: obey Go's naming convention
Upstream-commit: 7e29b33546098816d5dbc1fc429e868f02b69e44
Component: engine
2016-10-03 09:52:04 -04:00
a3df8d8c65
Merge pull request #27094 from allencloud/add-lock-in-libcontainerd-client
...
add lock in libcontainerd client AddProcess
Upstream-commit: 675e6224329dd46a8e5e52d7035da88fc97def94
Component: engine
2016-10-02 16:50:41 -07:00
84ce717a7a
Merge pull request #27097 from albers/completion-node-ps-multiple-nodes
...
Add support for multiple nodes in bash completion for `docker node ps`
Upstream-commit: 367d5b02322b8211c18b95faba1527ec591045f5
Component: engine
2016-10-02 14:38:46 +02:00
9ec0f309fb
Merge pull request #27096 from albers/completion-daemon--init-path
...
Add bash completion for `dockerd --init-path`
Upstream-commit: eca5ff194feca36acb6f6958f27a92eb74d86716
Component: engine
2016-10-02 14:37:13 +02:00
3d025590b1
Merge pull request #27060 from yongtang/27021-inspect-show-env
...
Disable HTML escaping for JSON strings in `docker inspect`
Upstream-commit: 420e22fad4dcdff3b8025666216cc85fc9358f69
Component: engine
2016-10-02 14:32:56 +02:00
9f3299176f
Add support for multiple nodes in bash completion for docker node ps
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 9aeb69a0690d0d26bd3dea344f675b22f9ceda19
Component: engine
2016-10-02 05:18:32 -07:00
22e87ff2f2
Add bash completion for dockerd --init-path
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: d710a3e1f8d1ffeeb141a08806e18623a36d2248
Component: engine
2016-10-02 05:10:00 -07:00
455b5fdd43
add lock in libcontainerd client AddProcess
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 278273bc1699873304240a6eca342b54051e2f23
Component: engine
2016-10-02 00:36:25 +08:00
8585d1a8a3
Merge pull request #26564 from miminar/prevent-blob-uploads
...
Avoid unnecessary blob uploads
Upstream-commit: 762556c705e96749bba34b7e32a7f464186ccd41
Component: engine
2016-10-01 12:53:10 +02:00
06272d8590
Revert "fix API doc service delete"
...
This reverts commit a12120e78c5852d5571da38e7b9e4cd49f41edc3.
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: bd996414667785fb6f69348038f973cfce20a2bc
Component: engine
2016-10-01 02:12:41 -07:00
51ec6bcf96
Merge pull request #27062 from yank1/Inconsistency-"on_failure"-vs-"on-failure"
...
Fix conversion of restart-policy from GRPC
Upstream-commit: 6e8a2cd29113896acfc3f97a43dd27f751f2f519
Component: engine
2016-10-01 10:39:00 +02:00
