John Howard
efa82c6561
Merge pull request #26926 from darrenstahlmsft/RevendorHcshim
...
Revendor hcsshim to v0.5.1
2016-10-06 08:35:37 -07:00
Brian Goff
f19120c305
Merge pull request #27167 from Microsoft/jjh/blockexport
...
Windows: export not supported
2016-10-06 16:05:36 +02:00
Brian Goff
48a75f6493
Merge pull request #27183 from darrenstahlmsft/BuildTests
...
Enable more build tests on Windows
2016-10-06 15:52:45 +02:00
Sebastiaan van Stijn
16a45dba89
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…
2016-10-06 14:13:41 +02:00
Vincent Demeester
2160953d26
Merge pull request #27181 from sdurrheimer/zsh-completion-daemon-init-path
...
Add zsh completion for 'dockerd --init-path'
2016-10-06 10:58:21 +02:00
Darren Stahl
443d7313f5
Enable more build tests on Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-10-06 00:53:30 -07:00
Sebastiaan van Stijn
306912eb92
Update reviewing process for unified docs repo
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-10-06 09:35:22 +02:00
Steve Durrheimer
3db5222340
Add zsh completion for 'dockerd --init-path'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-10-06 07:38:39 +02:00
Darren Stahl
267c04aa36
Revendor hcsshim to v0.5.1
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-10-05 14:40:51 -07:00
Alexander Morozov
921a0bf686
Merge pull request #26932 from dmcgowan/update-tar-split
...
Update tar split
2016-10-05 13:45:07 -07:00
Alexander Morozov
33ae7d4c19
Merge pull request #27149 from swernli/servicing_fix
...
Fixing servicing bug by always specifying LayerFolderPath
2016-10-05 13:21:47 -07:00
John Howard
73932d8d22
Windows: export not supported
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-10-05 13:15:44 -07:00
Michael Crosby
0b86ca9ad0
Merge pull request #26509 from LK4D4/commits_from_vendor
...
project: move go binaries installation to separate script
2016-10-05 13:15:30 -07:00
Alexander Morozov
ba9fb73280
Merge pull request #27037 from Microsoft/jjh/apistatsdatarace
...
Fix datarace in ApiStatsNetworkStatsVersioning
2016-10-05 13:06:40 -07:00
Alexander Morozov
f08a450ad3
Merge pull request #25837 from reaperhulk/support-compressing-build-context
...
Add support for compressing build context during image build
2016-10-05 12:57:46 -07:00
Tõnis Tiigi
aa8996f70b
Merge pull request #27039 from rojingeorge/patch-1
...
Updating the DockerFile for build failure, when make build is done, f…
2016-10-05 10:51:42 -07:00
John Howard
825e3a66a4
Fix datarace in ApiStatsnetworkStatsVersioning
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-10-05 10:12:46 -07:00
Michael Crosby
214b70e6ef
Merge pull request #27038 from jstarks/non_base_utilityvm
...
Windows: support Windows servicing layers
2016-10-05 10:02:31 -07:00
Tõnis Tiigi
67155f1c33
Merge pull request #27146 from duglin/fixCont
...
Require continuation char to be last char in a line
2016-10-05 09:49:47 -07:00
Kenfe-Mickaël Laventure
2616a909e8
Merge pull request #27153 from vieux/awscli_arm
...
add awscli to arm Dockerfile
2016-10-05 07:29:36 -07:00
Doug Davis
ed72c65a2a
Merge pull request #27154 from pwzgorilla/master
...
typo: modified `Server` as `Serve`
2016-10-05 07:03:18 -04:00
Phil Estes
5a2c19ac4a
Merge pull request #27156 from rheinwein/lf/update-installation-link
...
Update experimental/README link to binary installation instructions
2016-10-05 12:23:46 +02:00
Justin Cormack
d4b8bf49dd
Merge pull request #27042 from mlaventure/remove-ubuntu-wily
...
Remove Ubuntu 15.10 (Wily Werewolf) from build-deb targets
2016-10-05 12:19:05 +02:00
Justin Cormack
5a1efde8f2
Merge pull request #27139 from runcom/fix-WriteJSON
...
api/server/httputils: compile with go < 1.7 (WriteJSON)
2016-10-05 12:15:04 +02:00
Laura Frank
65e1103789
Update readme link to binary installation instructions
...
Signed-off-by: Laura Frank <ljfrank@gmail.com>
2016-10-05 11:13:08 +02:00
mgniu
97a4548bb3
typo: modified Server
as Serve
...
Signed-off-by: mgniu <mgniu@dataman-inc.com>
2016-10-05 12:20:31 +08:00
Brian Goff
c48317ad7c
Merge pull request #27152 from darrenstahlmsft/Rounding
...
Windows: fix rounding error in container resources
2016-10-04 21:08:14 -04:00
Victor Vieux
dbec45fa7a
add awscli to arm Dockerfile
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-10-04 16:22:59 -07:00
Stefan J. Wernli
78540d0d18
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>
2016-10-04 15:29:30 -07:00
Darren Stahl
1b48203f17
Windows: fix rounding error in container resources
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-10-04 14:11:32 -07:00
Kenfe-Mickael Laventure
e9a8105708
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>
2016-10-04 13:01:00 -07:00
Brian Goff
e097c2a938
Merge pull request #27148 from anusha-ragunathan/chg_import_path
...
Add plugingetter to pkg.
2016-10-04 15:17:08 -04:00
Anusha Ragunathan
d599d53db2
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>
2016-10-04 12:03:29 -07:00
Doug Davis
105bc63295
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>
2016-10-04 09:38:00 -07:00
Vincent Demeester
694ba71e36
Merge pull request #26989 from aboch/none
...
Respect --bridge=none
2016-10-04 16:25:39 +02:00
Brian Goff
5e072a25f8
Merge pull request #27136 from allencloud/add-lock-in-libcontainerd
...
add lock in libcontainerd client AddProcess of Windows
2016-10-04 09:29:59 -04:00
Antonio Murdaca
d1d505fa70
api/server/httputils: compile with go < 1.7
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-10-04 12:01:49 +02:00
allencloud
5143be0ccf
add lock in libcontainerd client AddProcess of Windows
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-10-04 10:29:21 +08:00
Anusha Ragunathan
0cc7f0185f
Merge pull request #26860 from anusha-ragunathan/nw-pv2
...
Make libnetwork use pluginv2.
2016-10-03 17:12:16 -07:00
Anusha Ragunathan
671d01aabf
Merge pull request #27128 from anusha-ragunathan/plugin-shutdown
...
Shutdown plugins after containers.
2016-10-03 17:08:22 -07:00
Victor Vieux
f60727d185
Merge pull request #27121 from LK4D4/fix_import
...
volume/local: fix import path
2016-10-03 16:48:20 -07:00
Victor Vieux
bd57e6d25c
Merge pull request #27126 from mlaventure/fix-tgz
...
Remove amd64 assumption in release.sh, cross and tgz scripts
2016-10-03 16:03:00 -07:00
Victor Vieux
0892a737d1
Merge pull request #27127 from vieux/revert_wrong_doc
...
Revert "fix API doc service delete"
2016-10-03 16:02:08 -07:00
Anusha Ragunathan
ed6e30767e
Shutdown plugins after containers.
...
Fixes #26278
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-10-03 15:52:44 -07:00
Kenfe-Mickael Laventure
61335bcb03
Remove amd64 assumption in release.sh, cross and tgz scripts
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-10-03 15:46:42 -07:00
Alexander Morozov
5af8cfd3b1
volume/local: fix import path
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-10-03 12:13:56 -07:00
Victor Vieux
94cd7ed72d
Merge pull request #27119 from vieux/fix_doc_delete_service
...
fix API doc service delete
2016-10-03 12:03:45 -07:00
Brian Goff
8b416fb025
Merge pull request #26960 from allencloud/make-remove-cloudprovider-network-return-204
...
make remove cloudprovider network return 204
2016-10-03 14:46:11 -04:00
Brian Goff
ce64a9bffd
Merge pull request #27085 from alexchenfeng/master
...
add check flag for CONFIG_NETFILTER_XT_MATCH_IPVS CONFIG_IP_VS_NFCT C…
2016-10-03 14:23:07 -04:00
Michael Crosby
e22d4b9654
Merge pull request #27078 from darrenstahlmsft/InteractiveRestartTest
...
Increase timeout in TestRunInteractiveWithRestartPolicy
2016-10-03 11:22:33 -07:00