Sebastiaan van Stijn
4a90ae0f7e
Merge pull request #19720 from vdemeester/carry-pr-18912
...
Carry #18912 : Docker Remote API documentation update
Upstream-commit: f923e5a5a441ab3f7fc70816f339f06718ea13bb
Component: engine
2016-02-11 16:40:59 +01:00
Brian Goff
3410e379c1
Merge pull request #19840 from aaronlehmann/resumable-downloads
...
Add support for resuming downloads on transfer failure
Upstream-commit: 2edd5f698ce28659154b8404034250bbfeb2ac52
Component: engine
2016-02-11 10:32:17 -05:00
Anonmily and Vincent Demeester
1d794c30ed
Docker Remote API documentation update
...
I was confused for the longest time on how to actually use and make requests against the remote API, so I think that it might help for those getting started with it to know how to actually test it out via curl. I added in parts on how to access the remote API via curl against the default unix socket, and also on how to configure the docker daemon to expose the API on a TCP port as well if desired.
Signed-off-by: Michelle Liu <michelle@michelleliu.io >
Upstream-commit: 2c60a9cba2e0920c9f1e8a193dcf0b6ddad71c5a
Component: engine
2016-02-11 16:28:15 +01:00
Brian Goff
09392de00e
Merge pull request #20222 from vdemeester/update-shakers-vendor-licence
...
Update shakers vendoring to include the LICENSE 😇
Upstream-commit: e7cd3b0897a8c6009eb099eae416b4c0eebb706d
Component: engine
2016-02-11 10:23:10 -05:00
Vincent Demeester
b547022504
Merge pull request #20052 from aditirajagopal/19301-overlay-network-unique-hostname
...
Overlay Network needs Unique Hostname
Upstream-commit: 2cca097ea83aeffb2d2f64ef322bad9a7a79299b
Component: engine
2016-02-11 15:41:54 +01:00
Sebastiaan van Stijn
704fe83e00
Merge pull request #20161 from tkopczynski/docs-before-since-filters
...
docker ps before and since filters documentation
Upstream-commit: 89f94ec03b73cb26963215b81e231f3cc433a38c
Component: engine
2016-02-11 15:32:50 +01:00
Vincent Demeester
dd28cfc3c0
Merge pull request #20216 from Microsoft/jjh/testunit-pkgplugins-v2
...
Windows CI: test-unit on pkg\plugins
Upstream-commit: 5627e400fe666da8159dd7555853e4ca8fbd5933
Component: engine
2016-02-11 12:39:08 +01:00
Sebastiaan van Stijn
f97ab8e007
Merge pull request #20213 from Microsoft/jjh/testunit-pkgmount
...
Windows CI: Unit Test - pkg/mount is Unix specific
Upstream-commit: d18c0d88f4504f258d3b3ce31f22b4205717d39c
Component: engine
2016-02-11 12:27:38 +01:00
Sebastiaan van Stijn
c4862b094f
Merge pull request #20219 from moxiegirl/remove-tutorial-build
...
Update Dockerfile
Upstream-commit: 8c0b1218c012d8d482ad171b1183092f56d9a5d3
Component: engine
2016-02-11 12:15:53 +01:00
Vincent Demeester
cdd4058063
Update shakers vendoring to include the LICENSE 😇
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 9ee8f0ad9d0128788440b245457e6447e52b97b4
Component: engine
2016-02-11 08:38:09 +01:00
Mary Anthony
7f00edaeb1
Update Dockerfile
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 8d673d9471d80bc8032f3280001bcd46f015a84a
Component: engine
2016-02-10 20:40:30 -08:00
John Howard
31b16ed933
Windows CI: test-unit on pkg\plugins
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 4b3001e85aff2c51a69eec205023e32384bebbdf
Component: engine
2016-02-10 19:28:30 -08:00
Arnaud Porterie
7f7a4e0915
Merge pull request #20184 from fkautz/pr_out_adding_backup_key_server_in_install_script
...
Adding backup key server in install script
Upstream-commit: e2a0618fb1f32572f2b5b11f97278634be4ea31c
Component: engine
2016-02-10 19:08:49 -08:00
John Howard
34dcc50973
Windows CI: Unit Test - pkg/mount is Unix specific
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: d509e615404d8e6f568cf30b6ad37311d4698ece
Component: engine
2016-02-10 18:09:15 -08:00
David Calavera
e9caeb643b
Merge pull request #20210 from Microsoft/jjh/hcswin32-v2
...
Windows: Revendor HCS to use revised error scheme
Upstream-commit: dfebb6074f62891368cb3c668380c186f3bebb33
Component: engine
2016-02-10 17:20:14 -08:00
Sebastiaan van Stijn
145acef25d
Merge pull request #19903 from londoncalling/cloud-installs-rel-a
...
added better what's next topics to point to new machine docs related …
Upstream-commit: ae8551c14482be085a6872f9541e3aa8c59a8ba3
Component: engine
2016-02-11 01:33:26 +01:00
David Calavera
c35751d5f0
Merge pull request #20170 from Microsoft/10662-TestBuildCI5
...
Fifth set of TestBuild CI enables for Windows
Upstream-commit: 9be87be582f1c4539e84385c1ac917418c015cdd
Component: engine
2016-02-10 16:02:26 -08:00
Alexander Morozov
d9ac9a5f49
Merge pull request #20208 from Microsoft/jjh/testunit-layer
...
Windows CI UnitTest TestLayerSize-->Unix
Upstream-commit: f1bf015ed805aa37b700ebe5d920a00f7f604ec8
Component: engine
2016-02-10 15:30:14 -08:00
Alexander Morozov
dcec7793ef
Merge pull request #20207 from Microsoft/jjh/fix18077-v2
...
Windows: Fix Isolation
Upstream-commit: 95d827cda21c690fabf1d577ea0c489ac26c805a
Component: engine
2016-02-10 15:29:39 -08:00
John Howard
0fe9b6b4f3
Windows: Use new error code mechanism from HCS
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 54263a93933a4a53f44ddea58ac16b2526e136e3
Component: engine
2016-02-10 14:48:24 -08:00
Victoria Bialas
3e249a8f81
added better what's next topics to point to new machine docs related to Issue #18282
...
updated cloud install example per Olivier's comments, added better command examples
updates per @thaJeztah comments
fixed links per @theJeztah comments, renamed cloud.md to overview.md for better URL name
updates per @moxiegirl comments, added alias for renamed file, modified links, changed a title
fixed link errors
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
Upstream-commit: 4e9e95fe8d9ba177ec77727b6fca558a0ba8f01f
Component: engine
2016-02-10 14:19:05 -08:00
John Howard
633d5a3bff
Windows: Revendor HCSShim@43858ef3
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: fadbbd335cfb6d32566267385e820b36c356c14e
Component: engine
2016-02-10 14:14:45 -08:00
John Howard
2e29d70d4a
Windows CI UnitTest TestLayerSize-->Unix
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 298d28014323a02b49614d2b91cd2adf0baa6ae1
Component: engine
2016-02-10 13:57:26 -08:00
John Howard and John Howard
58e5e14eef
Revendor engine-api @ ddfd776c
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: dfdce6e35ce67c8cb8b321588a577adbb02caca5
Component: engine
2016-02-10 13:26:35 -08:00
John Howard
f35a03ff6d
Windows: Fix 'isolation'
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: d4b0732499feac87cf7c433b9490a4e21e94fb45
Component: engine
2016-02-10 13:19:19 -08:00
Alexander Morozov
87cce96d08
Merge pull request #20205 from calavera/remove_last_daemon_references
...
Remove daemon dependency from api/server.
Upstream-commit: 2658341b5fe9dec5c4839f0721219111fb08b43f
Component: engine
2016-02-10 13:13:53 -08:00
Vincent Demeester
291efe0a93
Merge pull request #19814 from Microsoft/10662-TestBuildCI3
...
Third set of TestBuild* CI enabling for Windows
Upstream-commit: ab0102d671d9d531f99e176858ec5b2506bc77e3
Component: engine
2016-02-10 21:49:39 +01:00
Darren Stahl
104ddcecd2
Fifth set of TestBuild CI enables for Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 0adcce10a1b9373c0926eaee1269f50765a49f02
Component: engine
2016-02-10 12:37:58 -08:00
Brian Goff
ece9e00847
Merge pull request #20201 from Microsoft/jjh/objectidentifier
...
Windows CI: Another reliability fix
Upstream-commit: d2d66e9d551c59650dc14644cca70214d3274899
Component: engine
2016-02-10 15:29:42 -05:00
David Calavera
5c97141da9
Remove daemon dependency from api/server.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 1af76ef5970202bdbc7024d825c0fcfcc4ec6ede
Component: engine
2016-02-10 15:16:59 -05:00
John Howard
c8a52b977d
Windows CI: Another reliability fix
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 7853193edbd55ea5596c4df54895132ee88dc8fe
Component: engine
2016-02-10 11:07:29 -08:00
David Calavera
def405f4e4
Merge pull request #20165 from vdemeester/move-validatecontextdirectory-to-builder
...
Move validateContextDirectory to builder package.
Upstream-commit: e18eb6ef394522fa44bce7a3b9bb244d45ce9b56
Component: engine
2016-02-10 08:35:25 -08:00
Phil Estes
f6ab952c46
Merge pull request #20183 from hypriot/fix-20002-for-multiarch
...
Fix TestAuthZPluginAllowEventStream for multiarch
Upstream-commit: 7e44d0ca5872290a9b56c0a381bc370a3ffbc603
Component: engine
2016-02-10 09:42:35 -05:00
Antonio Murdaca
0a01ad0c9c
Merge pull request #19835 from ncdc/resize-after-attach
...
Move resize after attaching
Upstream-commit: c2ebdb3e573cbbb053eb4644119f3c99a6111bdc
Component: engine
2016-02-10 15:32:51 +01:00
Brian Goff
a2afb60dcc
Merge pull request #20181 from mavenugo/v0.6.1-rc2
...
Vendor libnetwork v0.6.1-rc2
Upstream-commit: f9abd42b98ec1b56cfa5d7d27562e8178136f1ac
Component: engine
2016-02-10 09:25:55 -05:00
Brian Goff
403bf945a4
Merge pull request #20174 from tophj-ibm/remove-power-from-logrus-tests
...
PPC64LE: Remove testing logrus output from ppc64le
Upstream-commit: cfa806378eafd159fce4b1158b215564419680d0
Component: engine
2016-02-10 09:07:47 -05:00
Sebastiaan van Stijn
8fa8b7aec3
Merge pull request #20173 from duglin/FixEnvDoc
...
Make it clear that env vars must be simple
Upstream-commit: e54ac9b3a1354daf7dd28f9bfd6fc411a25c4531
Component: engine
2016-02-10 13:22:29 +00:00
Frederick F. Kautz IV
0944ceb1d1
Adding backup key server in install script
...
Signed-off-by: Frederick F. Kautz IV <fkautz@redhat.com >
Upstream-commit: 5e0b8b99d115bc6b12d930e80aca69fecc7dda78
Component: engine
2016-02-09 23:26:45 -08:00
Stefan Scherer
31c6500d5a
Fix TestAuthZPluginAllowEventStream for multiarch
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com >
Upstream-commit: 36a974a1a6267828b773de19ed298947c66c4945
Component: engine
2016-02-10 07:28:50 +01:00
Madhu Venugopal
878a07f809
Vendor libnetwork v0.6.1-rc2
...
- Fixes #20132 #20140 #20019
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 84705f15d9b0226fa005cada11cad2ad5aad5179
Component: engine
2016-02-09 21:46:50 -08:00
Tibor Vass
c88ca91e41
Merge pull request #20135 from vdemeester/20087-fix-since-before-filters
...
Fix the since and before filter behavior
Upstream-commit: 61efb4d08487623474d6c21d68b0b34a2117da67
Component: engine
2016-02-09 21:13:00 -05:00
David Calavera
9394f6b721
Merge pull request #19661 from shishir-a412ed/tests_rootfs_pr
...
Tests for PR # 19123: daemon option (--storage-opt dm.basesize) for increasing the base device size on daemon restart
Upstream-commit: 321f2913241145061088769ab887ec7c27a87c70
Component: engine
2016-02-09 17:30:48 -08:00
Tibor Vass
6d4102dcb8
Merge pull request #20133 from mlaventure/dont-bind-mount-mqueue
...
Prevent mqueue from implicitely becoming a bind mount with --ipc=host
Upstream-commit: 0b4a7fb06d4b77265831cee1508aad9fbeddb7a2
Component: engine
2016-02-09 19:55:57 -05:00
Darren Stahl
dd3f7fc6e9
Third set of TestBuild* CI enabling for Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 4603a7259e133f5fdcb9e7856ca857338b26dd38
Component: engine
2016-02-09 15:19:38 -08:00
David Calavera
7d8fc9149c
Merge pull request #19985 from Microsoft/CombineSetupWorkingDir
...
Combine SetupWorkingDirectory for Linux and Windows
Upstream-commit: d6870238e329e43d2df291a5f82d27929f9a192d
Component: engine
2016-02-09 15:18:49 -08:00
David Calavera
8072979e73
Merge pull request #18943 from cpuguy83/fix_write_flusher
...
Remove Exists from backend
Upstream-commit: b3cb0d196d17aa04ca98292536b1f66e4490bbc5
Component: engine
2016-02-09 15:16:03 -08:00
Christopher Jones
7d5beb3fd8
Remove testing logrus output from ppc64le
...
This removes two tests on ppc64le.
There is an old bug with a syscall on power #8653 , that causes
logrus to default to using logfmt. These two tests look for
logrus format specific strings, and fail if they don't see it.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: 736e93a468fe8b8530ec5d00b9be7bbd53e306fc
Component: engine
2016-02-09 18:02:18 -05:00
Vincent Demeester
53c71bfb0a
Merge pull request #20059 from Microsoft/10662-TestBuildCI4
...
Fourth set of enabling Builder CI tests for Windows
Upstream-commit: 08d0a8384fdacf3fbb9230194efa18e91e382d56
Component: engine
2016-02-09 23:19:28 +01:00
David Calavera
58b0a87b35
Merge pull request #20167 from jfrazelle/butts
...
remove tasksmax, people on newer kernels can add it themselves
Upstream-commit: cb4a22b1a94e77f294e653d2ac07019d7ddf5edd
Component: engine
2016-02-09 14:18:51 -08:00
Kenfe-Mickael Laventure
a7fd8e1725
Disable TestRunMountshmmqueuefromhost when using userns
...
Since we now automatically mount the mqueue device inside the
container (instead of bind mounting the one from the host), when
trying to start a container with --ipc=host, the mount will fail with
EPERM.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: dba5a7f243e6c251176585571419b595172e9402
Component: engine
2016-02-09 14:16:08 -08:00