37c50543e9
Add note about legacy links
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 1cfab85c0ea759fed753dc2c71cdb4b87ad62400
Component: engine
2016-02-02 18:06:09 +01:00
7cb0758c9a
Merge pull request #19909 from Microsoft/jjh/testunit-daemon
...
Windows CI: Fix test-unit for daemon
Upstream-commit: 2b565014800d7126a5645f9bc3296f183d0f5257
Component: engine
2016-02-02 16:18:02 +01:00
ec3cd49e30
Fix memory-swap description in older API versions
...
A value of -1 disables the *limit* so enables unlimited swap
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 1c95b858ac040974d2be73bb31d0d59af9b0b960
Component: engine
2016-02-02 14:49:14 +01:00
4bdc3a71f5
Merge pull request #19912 from HackToday/fiximage
...
Correct old virtual size
Upstream-commit: 390077fcdcdf005bc3dde821596c88e355ef97ad
Component: engine
2016-02-02 14:06:58 +01:00
642e9a30eb
Correct old virtual size
...
In new content addressable model, image no longer
have virtual size column, it is now 'size'. So we
need to update related docs about them.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: 1ab7d76f30f3cf693c986eb827ad49a6554d806d
Component: engine
2016-02-02 12:28:33 +00:00
fc2f331561
Merge pull request #19822 from Microsoft/jjh/testexeccli
...
Windows CI: Initial porting CLI TestExec*
Upstream-commit: 5cdc0dfce3b058874566721b1f111baaa19df18b
Component: engine
2016-02-02 08:32:28 +01:00
19be4d0467
Windows CI: Fix test-unit for daemon
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 42f2621b0e19f263902e9f2eb3df0ef6d27d5fa4
Component: engine
2016-02-01 20:40:57 -08:00
eb79a73a95
Merge pull request #19889 from Microsoft/jjh/reliabilitytake2
...
Windows CI: TP4 reliability hack
Upstream-commit: a39ad952ec1efc3b7536d3d8a93e96a22cd1818b
Component: engine
2016-02-01 22:30:51 -05:00
52763c5ef6
Merge pull request #19902 from Microsoft/jstarks/revendor_hcsshim_fix_docker_crash
...
Revendor Microsoft/hcsshim and vendor Microsoft/go-winio
Upstream-commit: a034ac66eb766891676d1417826756870185de40
Component: engine
2016-02-01 22:30:08 -05:00
69d07840eb
Merge pull request #19907 from tiborvass/tty-debug
...
Prevent stdin from hanging
Upstream-commit: ec6bfebc0f36c15793be7e1a581cab0aafcb31c1
Component: engine
2016-02-01 21:57:32 -05:00
a3ac623fc2
Merge pull request #19861 from fangyuan930917/19350-remove-Info
...
remove the unused Info interface in daemon/execdriver/driver.go
Upstream-commit: 193ef9f0c150b26f960a4b09ecc3197b6e1965fb
Component: engine
2016-02-01 21:44:39 -05:00
32a339fec6
Merge pull request #19896 from calavera/same_rm_error_message
...
Make error message consistent when removing containers fail.
Upstream-commit: 3c0c115ec89031e0cbd9e739099828342efc872c
Component: engine
2016-02-01 21:19:42 -05:00
e2603dbc62
Windows CI: TP4 reliability hack
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 2ebcb48cf1b4f883260b62f687e2c54926749b68
Component: engine
2016-02-01 18:02:57 -08:00
2c45eb2fa9
Skip Close()-ing stdin on Darwin. The Return.
...
This was accidentally removed in https://github.com/docker/docker/pull/16289
Now adding it back.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 51795c083624b106fe7f338213cbc3d3812f31af
Component: engine
2016-02-01 20:38:01 -05:00
6925137469
Merge pull request #19899 from aboch/vnd
...
Vendoring libnetwork 0.6.0-rc7
Upstream-commit: f1e8d2c2958dc0142f0fb2b1efd349e54a92ef3f
Component: engine
2016-02-01 17:10:31 -08:00
dce9d7fda4
remove the unused Info interface in daemon/execdriver/driver.go and related code
...
Signed-off-by: Fangyuan Gao <21551127@zju.edu.cn >
Upstream-commit: 5d07d83ee0802391ff2ed5e10838376a9b817bba
Component: engine
2016-02-02 09:04:52 +08:00
848ab2d223
Merge pull request #19891 from icecrime/windows_login_issue
...
Enable cross-platforms login to Registry
Upstream-commit: 19eaa71e85f9563e1428347fa9a91c8aa71f1f6d
Component: engine
2016-02-01 19:50:54 -05:00
252a3f9cb5
Merge pull request #19794 from calavera/14358-disable-colors
...
[Carry 18621] Allow disabling of colored Docker logs via daemon flag.
Upstream-commit: 85475f7deabed7d94e98321bdb190f7eb756eaec
Component: engine
2016-02-01 15:37:44 -08:00
07bdbb1537
Revendor Microsoft/hcsshim and vendor Microsoft/go-winio
...
This update changes the way hcsshim invokes Windows DLLs to avoid races
with the garbage collector. It also now uses go-winio to access the
pipes used for communication with processes running in the container;
this reduces the number of threads used by docker.exe, improving
scalability.
Signed-off-by: John Starks <jostarks@microsoft.com >
Upstream-commit: 7ccc0e2101a66e0621faf1f043bf7cd5515501d5
Component: engine
2016-02-01 23:11:25 +00:00
b8ca800cbc
Merge pull request #19893 from cpuguy83/19890_debugs_for_all
...
handle debug mode for clients
Upstream-commit: 1734571539c8d1eb7928873ac03b948149ebafbb
Component: engine
2016-02-01 14:53:37 -08:00
bd6ac00111
Vendoring libnetwork 0.6.0-rc7
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: b80f761b141cf88c506f40b3e439cbe7a011c5d9
Component: engine
2016-02-01 14:52:18 -08:00
6118a0b79d
Merge pull request #19898 from joelwurtz/patch-1
...
Update docker-php link library from stage1
Upstream-commit: cf93b0bce1b24d30c9a1480ddb15a1f83f2b5fd4
Component: engine
2016-02-01 23:37:11 +01:00
6dc1df39d7
Merge pull request #19714 from vdemeester/carry-pr-18787
...
Carry #18787 : Update Instructions for Docker Remote API access
Upstream-commit: d95c4872135b0926e7911bf2b0b699e347c41e82
Component: engine
2016-02-01 23:26:40 +01:00
fd11be5874
Add test to make sure raw logs are properly activated.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 898599171e2f36a1cf36a2eea31d82a226acd802
Component: engine
2016-02-01 16:52:31 -05:00
ba3948fd3c
Update docker-php library from stage1
...
Signed-off-by: Joel Wurtz <joel.wurtz@gmail.com >
Upstream-commit: 9928b244e9c1eb32eb63fc7a9666a946ca8729d6
Component: engine
2016-02-01 22:45:34 +01:00
6da068ab26
Merge pull request #19553 from anusha-ragunathan/rm-daemonbuilder
...
Remove package daemonbuilder.
Upstream-commit: 680cf1c8f4164d7b3e95759a7cc93ce5843e5543
Component: engine
2016-02-01 13:20:00 -08:00
fb14e6604b
Allow disabling of colored Docker logs via daemon flag.
...
Signed-off-by: Vincent Woo <me@vincentwoo.com >
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 87a450a37f0e934b67c90fbcdbff28459216e332
Component: engine
2016-02-01 16:19:18 -05:00
c20ed2f433
Merge pull request #19416 from mlaventure/warn-on-rm-detach
...
Print an info message when detaching a container started with --rm
Upstream-commit: 245d6e83a9e739d0d6ab363bfabf779c9b1697f2
Component: engine
2016-02-01 13:17:23 -08:00
810a289a07
Merge pull request #19570 from WeiZhang555/18679-flaky-test
...
Fix flaky test `TestGetContainerStatsRmRunning`
Upstream-commit: a898478a795f3839b67ff119922bd0ba7d091a7e
Component: engine
2016-02-01 13:15:20 -08:00
f0d917c642
Merge pull request #19725 from WeiZhang555/opt-TestRunSeccompDefaultProfile
...
Optimize `TestRunSeccompDefaultProfile`
Upstream-commit: c28bba04601c153af5d8f70dd500e7247157b835
Component: engine
2016-02-01 16:01:51 -05:00
6337f0e1f4
Merge pull request #19708 from wenchma/19425-TestDaemonCorruptedLogDriverAddress
...
Optimize slow bottleneck tests of TestDaemonCorruptedLogDriverAddress
Upstream-commit: 0c620d62c2a538ae61af7dde33e013f095fe0686
Component: engine
2016-02-01 12:59:37 -08:00
fd8165a89d
Make error message consistent when removing containers fail.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 50de9fdff11065cbc9783be07ad1b78a35b6bbac
Component: engine
2016-02-01 15:32:50 -05:00
2dcfdf5354
handle debug mode for clients
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 78b0defcf344294874202e819dcb3f8a0daedf43
Component: engine
2016-02-01 14:36:40 -05:00
09d7504264
Enable cross-platforms login to Registry
...
Use a daemon-defined Registry URL for `docker login`. This allows a
Windows client interacting with a Linux daemon to properly use the
default Registry endpoint instead of the Windows specific one.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 960710bd810e70b7c06b77b956c7bf8cdfeb15f8
Component: engine
2016-02-01 11:18:54 -08:00
65eec6c5ac
Merge pull request #19885 from tophj-ibm/fix-integration-cli-suite-requirements
...
Fix integration-cli suite setup requirements
Upstream-commit: c19c08b97af613928bce1253e438e3c097ade7df
Component: engine
2016-02-01 11:13:39 -08:00
cb0539b747
Windows CI: Initial porting CLI TestExec*
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: a9379b4af227f1966b71ee255fc8bcf272ffe43c
Component: engine
2016-02-01 10:19:21 -08:00
fe296e65a0
Remove package daemonbuilder.
...
Currently, daemonbuilder package (part of daemon) implemented the
builder backend. However, it was a very thin wrapper around daemon
methods and caused an implementation dependency for api/server build
endpoint. api/server buildrouter should only know about the backend
implementing the /build API endpoint.
Removing daemonbuilder involved moving build specific methods to
respective files in the daemon, where they fit naturally.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 9c332b164f1aefa2407706adf59d50495d6e02cb
Component: engine
2016-02-01 09:57:38 -08:00
62fbfcd843
Merge pull request #19857 from aboch/vnd
...
Vendoring libnetwork 0.6.0-rc6
Upstream-commit: 69c381c8d1abcea98c7a700b45a4aae28675f7fe
Component: engine
2016-02-01 08:32:02 -08:00
ed1802777e
Merge pull request #19873 from HackToday/refactorfs
...
Make btrfs call same interface as others
Upstream-commit: 967848419af3e1d07d402a13e5893f4747a87914
Component: engine
2016-02-01 10:36:59 -05:00
f274470025
Merge pull request #19695 from Microsoft/10662-TestBuildCI2
...
Second set of enabling TestBuild CI for Windows
Upstream-commit: c2d6831fc498383be0ba9e555e3ab3139b844bb9
Component: engine
2016-02-01 16:29:52 +01:00
f73d475533
Merge pull request #19867 from Microsoft/jjh/disableunreliabletests
...
Windows CI: Turn off unreliable TP4 tests
Upstream-commit: ec67c8c4b6c9fd2bd6a0b434de77bc2be8524c58
Component: engine
2016-02-01 13:50:26 +01:00
1b865aed78
Add docker-volume-ipfs plugin to the list.
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b01886a556db9738b226fbcdd2384aff34118413
Component: engine
2016-02-01 13:30:15 +01:00
21a85d3fd5
Added link to Quobyte's volume plugin.
...
Signed-off-by: Felix Hupfeld <felix@quobyte.com >
Upstream-commit: 518c20787b5691e41261218b8b4e6671ddc646f3
Component: engine
2016-02-01 12:51:05 +01:00
af0e1e3cc9
change 'host:port' to host:port
...
Signed-off-by: Gang Qiao <qiaohai8866@gmail.com >
Upstream-commit: 7d1018545f5c38c936ed893145e70f84b8f50976
Component: engine
2016-02-01 17:22:16 +08:00
7aca59c08a
Make btrfs call same interface as others
...
Most storage drivers call graphdriver.GetFSMagic(home),
it is more clean to easy to maintain. So btrfs need to
adopt such change.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: feda5d768439c6ecb8d3c82cee332724302e7cd2
Component: engine
2016-02-01 07:50:21 +00:00
529d3187ec
Fix upgrade command
...
Signed-off-by: Weiyang Zhu <cnresonant@gmail.com >
Upstream-commit: a80c404cc61344067ae319ff82f78a22b31d4dbf
Component: engine
2016-02-01 12:59:21 +08:00
697d1c2bb0
Windows CI: Turn off unreliable TP4 tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 59f4369f1a09462ec0a2c6777931051fc1324396
Component: engine
2016-01-31 15:51:56 -08:00
7637bcdb16
Fix typo
...
Signed-off-by: Prayag Verma <prayag.verma@gmail.com >
Upstream-commit: 86beb6e27e9954e50828993ef0fb44486d2318ab
Component: engine
2016-02-01 01:25:59 +05:30
90c255b82a
Fix flaky test TestGetContainerStatsRmRunning
...
Remove racey code to fix flaky test
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 9a9ce80a0f5214011ddf68f93894b1c046435a8d
Component: engine
2016-01-31 15:34:22 +08:00
1fc2a011dc
Vendoring libnetwork 0.6.0-rc6
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: f943fd7d2427fbf893b9e0795528500fc99081b8
Component: engine
2016-01-30 20:03:03 -08:00
