ae6ecc60f9
Merge pull request #27171 from tonistiigi/improve-attach-closed
...
Improve TestAttachClosedOnContainerStop
Upstream-commit: e42ec6d7cb6090b3bc0b490d86961e780942caef
Component: engine
2016-10-07 11:26:33 +02:00
6be324c5f4
Merge pull request #26882 from runcom/proxy-path
...
Specify userland proxy path
Upstream-commit: 91312f71aabe4f0840060049259fc6dbfcc62cd2
Component: engine
2016-10-07 09:44:39 +02:00
39706ac8f3
Merge pull request #27206 from darrenstahlmsft/MoreWindowsTests
...
Enabled more test on Windows, API and Build
Upstream-commit: 323f8ceffd3110077144f16ad61fc03884f29df1
Component: engine
2016-10-07 08:57:40 +02:00
b38cf86690
Enabled more test on Windows, API and Build
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 6482410c9d708d0979aedfc65c156eba835cefb3
Component: engine
2016-10-06 17:18:42 -07:00
21c16cc44b
Merge pull request #27184 from tiborvass/gnupg-debian-stretch
...
install: fix debian stretch
Upstream-commit: 2fd674a00f98469caa1ceb572e5ae92a68b52f44
Component: engine
2016-10-06 14:20:03 -07:00
8f09fdc161
install: fix debian stretch
...
Apparently, Debian stretch does not come with gpg installed by
default. This patch ensures that gpg is installed.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 047264763adb3f61b1470b97e9fa20a4f1ddc83d
Component: engine
2016-10-06 22:23:08 +02:00
9ad2ffa17a
Merge pull request #27160 from mlaventure/update-containerd
...
Update containerd and runc
Upstream-commit: 5ee2c2a6475056f55327ce77b61677499a9e3fa8
Component: engine
2016-10-06 19:36:31 +02:00
9f9ffdba55
Merge pull request #27170 from fivestars/26991-consolez
...
Force input stream ANSI emulation for ConsoleZ
Upstream-commit: 28cca5dcaa2aa21123805d7f2d51916ea1f38d71
Component: engine
2016-10-06 17:37:16 +02:00
f0a774aa4a
Merge pull request #26926 from darrenstahlmsft/RevendorHcshim
...
Revendor hcsshim to v0.5.1
Upstream-commit: efa82c6561f991e108e2d7e3b5d012a886a2e6a9
Component: engine
2016-10-06 08:35:37 -07:00
b79ddee1da
daemon: add --userland-proxy-path flag
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: dd2e1947dc58d6807a5ddc401f84184fc5a77c2a
Component: engine
2016-10-06 17:31:53 +02:00
a4c533dd30
Merge pull request #27167 from Microsoft/jjh/blockexport
...
Windows: export not supported
Upstream-commit: f19120c305de68b1af5062479c19894fc85ecbb3
Component: engine
2016-10-06 16:05:36 +02:00
1ec9df3e63
Merge pull request #27183 from darrenstahlmsft/BuildTests
...
Enable more build tests on Windows
Upstream-commit: 48a75f6493697c4f0cbd44f1c83e04f5475c921e
Component: engine
2016-10-06 15:52:45 +02:00
384b4fc67f
Merge pull request #26797 from srodman7689/friendly_error_on_permissions_connection_error
...
Closes #26761 Updated the client/request.go sendClientRequest method to return a Pe…
Upstream-commit: 16a45dba89c0e024e87371725bb73e01cf49229a
Component: engine
2016-10-06 14:13:41 +02:00
01d37a68e4
Merge pull request #27181 from sdurrheimer/zsh-completion-daemon-init-path
...
Add zsh completion for 'dockerd --init-path'
Upstream-commit: 2160953d26b536e9abe76869649e93ecc7550477
Component: engine
2016-10-06 10:58:21 +02:00
49c4720cde
Enable more build tests on Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 443d7313f5fd23dd7fac7fe8ec70c9a8afdb9d9e
Component: engine
2016-10-06 00:53:30 -07:00
bc391d53f3
Update reviewing process for unified docs repo
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 306912eb92ef381f98f3ca957d28c56a56d258f8
Component: engine
2016-10-06 09:35:22 +02:00
ccf5d6bcd1
Add zsh completion for 'dockerd --init-path'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 3db52223402145e3e83d478d827abf5cfa20e981
Component: engine
2016-10-06 07:38:39 +02:00
c12d0e0fa9
Improve TestAttachClosedOnContainerStop
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 9d8f01b4f5ce3fe20c3116a486006a3e01f59fc5
Component: engine
2016-10-05 15:52:09 -07:00
6e5d016ba6
Update containerd and runc
...
containerd: 837e8c5e1cad013ed57f5c2090c8591c10cbbdae
runc: 02f8fa7863dd3f82909a73e2061897828460d52f
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 7e12c3bb99381f117be73e05c187be6ce44280b9
Component: engine
2016-10-05 14:47:15 -07:00
02536572fb
Revendor hcsshim to v0.5.1
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 267c04aa36a54260242a2cffbd19d4f25f782e94
Component: engine
2016-10-05 14:40:51 -07:00
3a03b98841
Merge pull request #26932 from dmcgowan/update-tar-split
...
Update tar split
Upstream-commit: 921a0bf686370587aec812a3a0efb002adf07614
Component: engine
2016-10-05 13:45:07 -07:00
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
ad2852600f
Windows: export not supported
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 73932d8d22915b02f9e55158f05bf5f85505e875
Component: engine
2016-10-05 13:15:44 -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
afe0671bd1
Force input stream ANSI emulation for ConsoleZ
...
This performs a similar check to the `"ConEmuANSI"` check that was recently
added to enable arrow keys navigation in docker container terminals.
Signed-off-by: Josh Wilson <josh.wilson@fivestars.com >
Upstream-commit: c0a5772668c5a2cb6d17a6b5907fc3eb08d18cc7
Component: engine
2016-10-05 12:42:48 -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
