1a5ffe3e32
Fix critical bug: can't restart a restarting container
...
When user try to restart a restarting container, docker client report
error: "container is already active", and container will be stopped
instead be restarted which is seriously wrong.
What's more critical is that when user try to start this container
again, it will always fail.
This error can also be reproduced with a `docker stop`+`docker start`.
And this commit will fix the bug.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: a705e166cf3bcca62543150c2b3f9bfeae45ecfa
Component: engine
2016-04-08 22:02:30 +08:00
fd446e3c8a
Merge pull request #21815 from Microsoft/jjh/fixunittest
...
Windows: Fix failing unit tests
Upstream-commit: 3e14070c880dc1f3d9ca81c55f84ccebe8d89ad2
Component: engine
2016-04-07 21:14:42 -04:00
9e5a9af85e
Merge pull request #21871 from tonistiigi/fix-restartpolicy-on-restart
...
Fix restart monitor stopping on manual restart
Upstream-commit: 0c4f28e51a45bdc21ba9fa1630bdf52c944778eb
Component: engine
2016-04-07 20:56:33 -04:00
048b376d5a
Merge pull request #21816 from estesp/case-of-the-missing-else
...
Don't perform external setkey when net==host
Upstream-commit: fc352287c17cb044dca49b253dee9050748535ad
Component: engine
2016-04-07 17:01:30 -07:00
3b340912c5
Fix restart monitor stopping on manual restart
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 20390f65c487cfbe18e1f21650086a00e41eadff
Component: engine
2016-04-07 16:12:05 -07:00
ecdfed949e
Merge pull request #21750 from LK4D4/flaky_format_test
...
integration-cli: try to make TestEventsTimestampFormats less flaky
Upstream-commit: 14015eedb16c11b2f7e7a0b5ca45e78d24d34c7a
Component: engine
2016-04-07 13:42:17 -07:00
069b2b7c5b
Merge pull request #21859 from tonistiigi/vendor-net-fork
...
vendor: patch template init in trace pkg for performance
Upstream-commit: 14aa019d2de3bd7f21d29d920bd074015a0e7d8d
Component: engine
2016-04-07 22:39:23 +02:00
c81691ebc7
Merge pull request #21806 from Microsoft/RemoveSymlinkTests
...
Stop running symlink-volume tests on Windows
Upstream-commit: 07f580489908bf6a3373daac1473045406e1130d
Component: engine
2016-04-07 22:03:44 +02:00
ef51d8c512
vendor: patch template init in trace pkg for performance
...
Temporarily include a fork of golang/net package
that includes a performance patch. Measured performance
gain is ~60ms for every `docker run` command.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 07fe6947a403124041dda50eb6d7f00e74f96ce7
Component: engine
2016-04-07 11:02:14 -07:00
ce5759e885
Merge pull request #21855 from vdemeester/makefile-typo
...
Fixing a typo in Makefile
Upstream-commit: 1fbdd354c2df5cebf981fcd6afe1355fbb040fd8
Component: engine
2016-04-07 16:41:25 +00:00
32c33f154c
Merge pull request #21628 from clnperez/systemd-tasksmax-workaround
...
Build-deb hack for systemd tasksmax
Upstream-commit: e82830ecde02b3a607d5f3b470f2c4eff17c37e7
Component: engine
2016-04-07 12:30:45 -04:00
0b7d02b0d9
Build-deb hack for systemd tasksmax
...
Since we can't use the TasksMax value in the docker.service
file by default, we can uncomment it at buildtime.
See docker/docker/pull/21491 for some background.
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com >
Upstream-commit: 2b849e0263576a818fafd73ba0467633db3bb6cb
Component: engine
2016-04-07 11:08:30 -05:00
a30f33e6a5
Merge pull request #21840 from tonistiigi/fix-closing-attach-streams
...
Fix closing attach streams on lost tcp connection
Upstream-commit: 4f8a6f3e02135ade04d31b493ed08af4b308b9e0
Component: engine
2016-04-07 12:02:33 -04:00
0038ff8590
Fixing a typo in Makefile
...
A typo is present in the new awesome `make help`, fixing that.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 3785844c5bdd57ded9a6410579e3a356b126c26e
Component: engine
2016-04-07 16:10:09 +02:00
82647f4d8c
Merge pull request #21820 from estesp/lazy-init-useradd
...
Lazy init useradd and remove init()
Upstream-commit: d5dfc4e5262a56181b2203c3fb6474ebe3a4ae92
Component: engine
2016-04-07 10:09:02 +02:00
742837d4b6
Merge pull request #21828 from dmcgowan/fix-overlay-on-overlay-test
...
Fix overlay test running on overlay
Upstream-commit: 2e236d0255bd6f4f5f37c2512f89b22655d47d1f
Component: engine
2016-04-07 10:07:25 +02:00
693053b90a
Merge pull request #21842 from tonistiigi/fix-flaky-testsaveloadparents
...
Fix flaky TestSaveLoadParents
Upstream-commit: 334f73f5b4162ffc3bfb5a07323c83e732bfbfa6
Component: engine
2016-04-07 10:01:28 +02:00
24e68a306f
Merge pull request #21835 from HackToday/fixsecurity
...
Fix deprecated format for security-opt
Upstream-commit: 36bc01c0cb6ff48b70aad17231d8561bc418096f
Component: engine
2016-04-07 09:28:58 +02:00
63950888d2
Merge pull request #21830 from anusha-ragunathan/auplink
...
Be more lenient on auplink errors.
Upstream-commit: 8785952282a444358e934678b3833be935340259
Component: engine
2016-04-07 09:19:38 +02:00
7db547d6f1
Fix flaky TestSaveLoadParents
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 0c0198a5e671928b67db6a3be35f1a419f633af4
Component: engine
2016-04-06 21:58:47 -07:00
6a3a5e1d71
Fix typo
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 5fdbce3185913b82f516938deedb954c612d7d5d
Component: engine
2016-04-07 12:46:55 +08:00
4b68403613
Fix closing attach streams on lost tcp connection
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: a47cd639158ee9cfd228c0ae8257301b8510f3ad
Component: engine
2016-04-06 21:27:47 -07:00
bab358354a
Fix overlay test running on overlay
...
Overlay tests were failing when /var/tmp was an overlay mount with a misleading message.
Now overlay tests will be skipped when attempting to be run on overlay.
Tests will now use the TMPDIR environment variable instead of only /var/tmp
Fixes #21686
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 824c72f4727504e3a8d37f87ce88733c560d4129
Component: engine
2016-04-06 21:06:42 -07:00
9358edbd4e
Merge pull request #21821 from vieux/make_help
...
add `make help`
Upstream-commit: da0985fd16ef642856a249cd523f5c043748e6a5
Component: engine
2016-04-07 02:51:27 +00:00
d23c572e2b
Fix deprecated format for security-opt
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: 0b207e75585cd4ba9a40460d87766052dd7508a7
Component: engine
2016-04-07 02:09:18 +00:00
b63495d305
Be more lenient on auplink errors.
...
On aufs, auplink is run before the Unmount. Irrespective of the
result, we proceed to issue a Unmount syscall. In which case,
demote erros on auplink to warning.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: dbd9b7e121c2e20e5429fdc97421c9510746161e
Component: engine
2016-04-06 18:24:19 -07:00
64c1d67e0a
remove docker info warnings (if any) from Makefile
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: b967e381aac05bd309a0ce9eb2f0c46d4a60d8a7
Component: engine
2016-04-06 16:57:33 -07:00
3791d8a070
add make help
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: c72b51b09c2a51ef82b00a8ab69002088f2f3249
Component: engine
2016-04-06 16:57:28 -07:00
86db45237f
Merge pull request #21733 from Microsoft/sjw/updatepending
...
Adding postRunProcessing infrastructure for hanlding Windows Update.
Upstream-commit: 9d7f6bb921d7ea9a0954fe0e4e7612742935a540
Component: engine
2016-04-06 15:36:39 -07:00
3ff2903f19
Lazy init useradd and remove init()
...
This should not have been in init() as it causes these lookups to happen
in all reexecs of the Docker binary. The only time it needs to be
resolved is when a user is added, which is extremely rare.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com >
Upstream-commit: c6f45fd2eef00d6dcdcf319400c0c6cd891e9d2a
Component: engine
2016-04-06 17:53:45 -04:00
5d96f48931
Merge pull request #21691 from tonistiigi/fix-gccgo-make
...
Fix building gccgo from makefile
Upstream-commit: 76aefc18f988d1c21382e3be88edcb6c99a91ea7
Component: engine
2016-04-06 17:31:59 -04:00
fd0de04ee0
integration-cli: try to make TestEventsTimestampFormats less flaky
...
Fix #21749
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 3f358aeaca2bf02ea33e6d487a69f60fff88084c
Component: engine
2016-04-06 14:31:39 -07:00
303525ea6c
Merge pull request #21810 from aboch/vnd
...
Vendoring libnetwork v0.7.0-rc.4
Upstream-commit: d82e522e36a6d1ce89185bcddd05511c0a074eed
Component: engine
2016-04-06 14:18:33 -07:00
fd21ba82c6
Merge pull request #21809 from Microsoft/jjh/tp4removal
...
Windows: Remove TP4 support from main codebase
Upstream-commit: 65464d11f1b1aac6a5b9792cb599e23f376d169d
Component: engine
2016-04-06 14:11:33 -07:00
a1edae7884
Adding postRunProcessing infrastructure for hanlding Windows Update.
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
Upstream-commit: 818a5198e4a76cd63ff84a7796ff3b0b91302552
Component: engine
2016-04-06 14:03:05 -07:00
5b67737597
Don't perform external setkey when net==host
...
This else case was lost in the migration from native execdriver to OCI
implementation via runc. There is no need to have external setkey when
--net=host.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com >
Upstream-commit: 1771d35b4852be197c90c19ba5aada940e133c2b
Component: engine
2016-04-06 16:45:43 -04:00
69969b53e0
Windows: Fix failing unit tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: ccd0da908ac2b0743ca2c8e80c589295fd3b2563
Component: engine
2016-04-06 13:42:15 -07:00
1ca23d3d69
Merge pull request #21805 from LK4D4/unused_stuff
...
all: remove some unused funcs and variables
Upstream-commit: 40dc921da21e4f1fd165f1d7da87d600e3eb8609
Component: engine
2016-04-06 16:27:14 -04:00
5da6bec3ad
Merge pull request #21092 from WeiZhang555/fix-21064-detach-keys
...
Client print error when specify wrong detach keys
Upstream-commit: 5709f8e4227e0e1da333739c44003a3f47279bd5
Component: engine
2016-04-06 22:14:14 +02:00
2d2dce7886
Merge pull request #21794 from coolljt0725/cleanipc_quiet
...
Don't throw error on clenaup ipc mounts if it does not exists
Upstream-commit: 02297d5a33958abac7d83ee8ec5aada32152db79
Component: engine
2016-04-06 16:10:53 -04:00
ab040ceb02
Merge pull request #21783 from vieux/fix_21772
...
do not trim one char from {{.Names}} each time it is used in --format
Upstream-commit: 2bbe75cdb62d4f53c6bd3f1586aa782b7b116f31
Component: engine
2016-04-06 13:01:22 -07:00
5ada0d9d57
Merge pull request #21723 from devimc/master
...
Fix compilation errors with btrfs-progs-4.5
Upstream-commit: 8c361eb5da51318168d7d1bd2214f7369de28394
Component: engine
2016-04-06 15:56:42 -04:00
1735136bd7
Merge pull request #21802 from tiborvass/carry-21716
...
Carry 21716: When container had no layer data, cleanupContainer crashed
Upstream-commit: 6bd429cb2aabfed7a39748aa3fefd047883f893a
Component: engine
2016-04-06 15:21:38 -04:00
f0315af665
Vendoring libnetwork v0.7.0-rc.4
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 8a957bafa58e2eed8f31722c7fcc3709ca509a29
Component: engine
2016-04-06 12:18:21 -07:00
9f10b4351a
Windows: Remove TP4 support from main code
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 331c8a86d489e573fcbf1df3c4f813bbc3168624
Component: engine
2016-04-06 12:12:20 -07:00
feab92573f
Merge pull request #21768 from shishir-a412ed/fix_docker_run
...
Ignore os.IsNotExist errors when calling ToDiskLocking
Upstream-commit: 40ccb7114e7aceca38e66b365d4f54e4f4d64d0c
Component: engine
2016-04-06 14:12:38 -04:00
0dfaed7e71
do not trim one char from {{.Names}} each time it is used in --format
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 68ade49adab15429168903f5600ab64ce7f7c8c5
Component: engine
2016-04-06 11:04:13 -07:00
db8e9f9830
Merge pull request #21804 from mlaventure/arm-fix
...
Skip migration unit test on non amd64 platform
Upstream-commit: 27f50c40e6d2fffaf0bb7811f9c602943fea5e24
Component: engine
2016-04-06 11:01:23 -07:00
e6a7fb2bb7
Merge pull request #21780 from sanimej/libn-v0.7rc2
...
Vendor Libnetwork v0.7.0-rc.3
Upstream-commit: a79e79c58e7da0ab8519e708271f0e45a341c3d2
Component: engine
2016-04-06 13:54:21 -04:00
842746c494
all: remove some unused funcs and variables
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 5ee8652a21756b1b4719e3477bd871d13b237c12
Component: engine
2016-04-06 10:40:01 -07:00
