b83e9df760
Fix the docker image --no-trunk output format
...
docker 1.10 change the output format of image id.
Signed-off-by: hyzhou.zhy <hyzhou.zhy@alibaba-inc.com>
2016-04-08 08:59:59 +08:00
fc352287c1
Merge pull request #21816 from estesp/case-of-the-missing-else
...
Don't perform external setkey when net==host
2016-04-07 17:01:30 -07:00
14015eedb1
Merge pull request #21750 from LK4D4/flaky_format_test
...
integration-cli: try to make TestEventsTimestampFormats less flaky
2016-04-07 13:42:17 -07:00
14aa019d2d
Merge pull request #21859 from tonistiigi/vendor-net-fork
...
vendor: patch template init in trace pkg for performance
2016-04-07 22:39:23 +02:00
07f5804899
Merge pull request #21806 from Microsoft/RemoveSymlinkTests
...
Stop running symlink-volume tests on Windows
2016-04-07 22:03:44 +02:00
07fe6947a4
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>
2016-04-07 11:02:14 -07:00
1fbdd354c2
Merge pull request #21855 from vdemeester/makefile-typo
...
Fixing a typo in Makefile
2016-04-07 16:41:25 +00:00
e82830ecde
Merge pull request #21628 from clnperez/systemd-tasksmax-workaround
...
Build-deb hack for systemd tasksmax
2016-04-07 12:30:45 -04:00
2b849e0263
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>
2016-04-07 11:08:30 -05:00
4f8a6f3e02
Merge pull request #21840 from tonistiigi/fix-closing-attach-streams
...
Fix closing attach streams on lost tcp connection
2016-04-07 12:02:33 -04:00
3785844c5b
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>
2016-04-07 16:10:09 +02:00
d5dfc4e526
Merge pull request #21820 from estesp/lazy-init-useradd
...
Lazy init useradd and remove init()
2016-04-07 10:09:02 +02:00
2e236d0255
Merge pull request #21828 from dmcgowan/fix-overlay-on-overlay-test
...
Fix overlay test running on overlay
2016-04-07 10:07:25 +02:00
334f73f5b4
Merge pull request #21842 from tonistiigi/fix-flaky-testsaveloadparents
...
Fix flaky TestSaveLoadParents
2016-04-07 10:01:28 +02:00
36bc01c0cb
Merge pull request #21835 from HackToday/fixsecurity
...
Fix deprecated format for security-opt
2016-04-07 09:28:58 +02:00
8785952282
Merge pull request #21830 from anusha-ragunathan/auplink
...
Be more lenient on auplink errors.
2016-04-07 09:19:38 +02:00
d7a04c7416
Merge pull request #21841 from WeiZhang555/error-typo
...
Fix typo
2016-04-07 08:56:43 +02:00
0c0198a5e6
Fix flaky TestSaveLoadParents
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-04-06 21:58:47 -07:00
5fdbce3185
Fix typo
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-04-07 12:46:55 +08:00
a47cd63915
Fix closing attach streams on lost tcp connection
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-04-06 21:27:47 -07:00
824c72f472
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)
2016-04-06 21:06:42 -07:00
da0985fd16
Merge pull request #21821 from vieux/make_help
...
add `make help`
2016-04-07 02:51:27 +00:00
0b207e7558
Fix deprecated format for security-opt
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-04-07 02:09:18 +00:00
dbd9b7e121
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>
2016-04-06 18:24:19 -07:00
b967e381aa
remove docker info warnings (if any) from Makefile
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-04-06 16:57:33 -07:00
c72b51b09c
add `make help`
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-04-06 16:57:28 -07:00
9d7f6bb921
Merge pull request #21733 from Microsoft/sjw/updatepending
...
Adding postRunProcessing infrastructure for hanlding Windows Update.
2016-04-06 15:36:39 -07:00
c6f45fd2ee
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>
2016-04-06 17:53:45 -04:00
76aefc18f9
Merge pull request #21691 from tonistiigi/fix-gccgo-make
...
Fix building gccgo from makefile
2016-04-06 17:31:59 -04:00
3f358aeaca
integration-cli: try to make TestEventsTimestampFormats less flaky
...
Fix #21749
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-04-06 14:31:39 -07:00
d82e522e36
Merge pull request #21810 from aboch/vnd
...
Vendoring libnetwork v0.7.0-rc.4
2016-04-06 14:18:33 -07:00
65464d11f1
Merge pull request #21809 from Microsoft/jjh/tp4removal
...
Windows: Remove TP4 support from main codebase
2016-04-06 14:11:33 -07:00
818a5198e4
Adding postRunProcessing infrastructure for hanlding Windows Update.
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
2016-04-06 14:03:05 -07:00
1771d35b48
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>
2016-04-06 16:45:43 -04:00
40dc921da2
Merge pull request #21805 from LK4D4/unused_stuff
...
all: remove some unused funcs and variables
2016-04-06 16:27:14 -04:00
5709f8e422
Merge pull request #21092 from WeiZhang555/fix-21064-detach-keys
...
Client print error when specify wrong detach keys
2016-04-06 22:14:14 +02:00
02297d5a33
Merge pull request #21794 from coolljt0725/cleanipc_quiet
...
Don't throw error on clenaup ipc mounts if it does not exists
2016-04-06 16:10:53 -04:00
2bbe75cdb6
Merge pull request #21783 from vieux/fix_21772
...
do not trim one char from {{.Names}} each time it is used in --format
2016-04-06 13:01:22 -07:00
8c361eb5da
Merge pull request #21723 from devimc/master
...
Fix compilation errors with btrfs-progs-4.5
2016-04-06 15:56:42 -04:00
6bd429cb2a
Merge pull request #21802 from tiborvass/carry-21716
...
Carry 21716: When container had no layer data, cleanupContainer crashed
2016-04-06 15:21:38 -04:00
8a957bafa5
Vendoring libnetwork v0.7.0-rc.4
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-04-06 12:18:21 -07:00
331c8a86d4
Windows: Remove TP4 support from main code
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-04-06 12:12:20 -07:00
40ccb7114e
Merge pull request #21768 from shishir-a412ed/fix_docker_run
...
Ignore os.IsNotExist errors when calling ToDiskLocking
2016-04-06 14:12:38 -04:00
68ade49ada
do not trim one char from {{.Names}} each time it is used in --format
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-04-06 11:04:13 -07:00
27f50c40e6
Merge pull request #21804 from mlaventure/arm-fix
...
Skip migration unit test on non amd64 platform
2016-04-06 11:01:23 -07:00
a79e79c58e
Merge pull request #21780 from sanimej/libn-v0.7rc2
...
Vendor Libnetwork v0.7.0-rc.3
2016-04-06 13:54:21 -04:00
5ee8652a21
all: remove some unused funcs and variables
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-04-06 10:40:01 -07:00
636e7760e2
Merge pull request #21787 from npcode/fix-docs-plugin-api-markdown
...
Fix incorrect markdown rendering
2016-04-06 10:18:11 -07:00
3d800dc019
Merge pull request #21712 from yongtang/21335-docs-container-with-volumes
...
Remote API docs give incorrect example for creating a container with volumes.
2016-04-06 10:15:37 -07:00
cf73ebf280
Skip migration unit test on non amd64 platform
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-04-06 10:10:58 -07:00
Hyzhou
Sebastiaan van Stijn
Vincent Demeester
Tonis Tiigi
Jess Frazelle
Tibor Vass
Christy Perez
Brian Goff
Zhang Wei
Derek McGowan
Kai Qiang Wu(Kennan)
Anusha Ragunathan
Victor Vieux
John Howard
Phil Estes
Alexander Morozov
Alexander Morozov
Stefan J. Wernli
Phil Estes
Alessandro Boch
John Howard
Kenfe-Mickael Laventure