Yong Tang
8024cf3175
Merge pull request #35695 from boucher/upgrade-criu
...
Update CRIU version in the shell Dockerfile
Upstream-commit: c7dd58ffbf268680653b2905f6cd08a1eaf4d9c8
Component: engine
2017-12-05 15:49:02 -06:00
Yong Tang
dfe161a946
Merge pull request #35707 from crosbymichael/ctd-1.0
...
Update to containerd v1.0.0
Upstream-commit: 7a14e267d6496b4843aca6170876e7cf53d71f58
Component: engine
2017-12-05 14:02:23 -06:00
Sebastiaan van Stijn
9ece0a8dbe
Merge pull request #35700 from cpuguy83/plugin_store_rm_test
...
Add test to check for plugin mounts on remove
Upstream-commit: 27506b353002a2263e753f267e130f133b12c0fc
Component: engine
2017-12-05 10:54:04 -08:00
Sebastiaan van Stijn
4d1f5d1e42
Merge pull request #35529 from dungeonmaster18/subsecond-precision-config
...
Added SubSecondPrecision to config option.
Upstream-commit: 3461289bf0e9147afc88cd829acc0bb8b64e1053
Component: engine
2017-12-05 10:14:14 -08:00
Michael Crosby
d27e345310
Fix event filters
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: a27abc619cc18ead61fa89f652871fac1b318658
Component: engine
2017-12-05 09:55:33 -05:00
Michael Crosby
e1f6e66d66
Update containerd to v1.0.0
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 18a53d03740220aa72e454929ad1d1d6b695888e
Component: engine
2017-12-05 09:44:42 -05:00
Umesh Yadav
12e67ce519
Added SubSecondPrecision flag in fluentd logger
...
Signed-off-by: dungeonmaster18 <umesh4257@gmail.com >
Upstream-commit: a1ebda09bab5bf22d96a15e71618c4a0ac08bb55
Component: engine
2017-12-05 17:21:57 +05:30
Brian Goff
dfd519caff
Add test to check for plugin mounts on remove
...
Ensures that when a plugin is removed that it doesn't interfere with
other plugins mounts and also ensures its own mounts are cleaned up.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 5017b5bef55c31db4c04c8058ef7db8597b11341
Component: engine
2017-12-04 22:01:14 -05:00
Yong Tang
327b80ad82
Merge pull request #35537 from sargun/vfs-use-copy_file_range
...
Have VFS graphdriver use accelerated in-kernel copy
Upstream-commit: 4047cede65862aa0ea5616297d7c0f3b12526ad4
Component: engine
2017-12-04 19:34:56 -06:00
Ross Boucher
6ada520445
Update CRIU github repository
...
Signed-off-by: Ross Boucher <rboucher@gmail.com >
Upstream-commit: f01d2029bbee7327b324ee501a97100ad5506fbf
Component: engine
2017-12-04 18:51:08 -05:00
Ross Boucher
2ee063b98e
CRIU needs a newer version to work with the updates pulled in by containerd 1.0
...
Signed-off-by: Ross Boucher <rboucher@gmail.com >
Upstream-commit: 7ffae3d51a452a63c49f8544953a8b0f9781a5e0
Component: engine
2017-12-04 17:45:04 -05:00
Brian Goff
f28070bdef
Merge pull request #35693 from crosbymichael/ctd-rc0
...
Update containerd to rc0 +
Upstream-commit: 20a42b1f5616b07df524965383528711d24cf6ea
Component: engine
2017-12-04 16:49:29 -05:00
Michael Crosby
8b1197a568
Fix nonewmountns for containerd options
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 97b0a9d5f195c7daf16cf9dcfb6c4d62044163fe
Component: engine
2017-12-04 14:17:30 -05:00
Michael Crosby
08c25433ac
Bump containerd to cc969fb42f427a68a8cc6870ef47f17
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: ad2b34f2056ca7d6edab17967a797fb19bf4ed5a
Component: engine
2017-12-04 14:14:42 -05:00
Sebastiaan van Stijn
cbec60ecae
Merge pull request #35687 from tiborvass/add-derek-bot
...
project: try alexellis/derek bot to manage PRs and issues
Upstream-commit: d94164867c2df977ceb8d9df3d90364d0a682d05
Component: engine
2017-12-04 09:54:02 -08:00
Tibor Vass
d47afe4a42
project: try alexellis/derek bot to manage PRs and issues
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 123cb9590739a517caa6821a92d9becb2f723547
Component: engine
2017-12-04 16:11:41 +01:00
Yong Tang
bf78150b9b
Merge pull request #35600 from nictuku/go_option
...
Set a go_package on api/types/swarm/runtime to make it Bazel compatible
Upstream-commit: 7ef9266ba090a3230355c39352dddf41aeb5b726
Component: engine
2017-12-01 17:30:12 -08:00
Daniel Nephin
5016fee3dc
Merge pull request #35578 from thaJeztah/fix-portbindings-swagger
...
Fix PortBindings definition in Swagger
Upstream-commit: ac68411f85a1c4540c0d4f5b7db86b0b0422f025
Component: engine
2017-12-01 17:46:38 -05:00
Madhu Venugopal
9a7838eb22
Merge pull request #35422 from pradipd/lbfix
...
Move load balancer sandbox creation/deletion into libnetwork
Upstream-commit: 4bb2c2402df88f0e3e8c47499fc2de5182719e00
Component: engine
2017-12-01 14:08:48 -08:00
Sargun Dhillon
20a2865e53
Fix setting mtimes on directories
...
Previously, the code would set the mtime on the directories before
creating files in the directory itself. This was problematic
because it resulted in the mtimes on the directories being
incorrectly set. This change makes it so that the mtime is
set only _after_ all of the files have been created.
Signed-off-by: Sargun Dhillon <sargun@sargun.me >
Upstream-commit: 77a2bc3e5bbc9be3fe166ed8321b7cd04e7bd097
Component: engine
2017-12-01 09:12:43 -08:00
Victor Vieux
b611814dc6
Merge pull request #35628 from ikarpovich/35626-le-line-only-legacy
...
Logentries line-only logopt fix to maintain backwards compatibility
Upstream-commit: 3a9ab941adcc7a39c3ea8c52e3c215cdddb2fe67
Component: engine
2017-11-30 15:48:56 -08:00
Yong Tang
f67476ad43
Merge pull request #35645 from crosbymichael/ctd-10
...
Update containerd to pre-1.0 rc commit
Upstream-commit: 3eb7314519714e0392a4863d6cd4beb3a4b206e8
Component: engine
2017-11-30 15:22:01 -08:00
Pradip Dhara
b8226cb988
Adding test for creating service multiple times.
...
Signed-off-by: Pradip Dhara <pradipd@microsoft.com >
Upstream-commit: 791d88b8538b4949153d346ec738139aa6d15280
Component: engine
2017-11-30 13:03:44 -08:00
Pradip Dhara
19fca6eb66
docker changes corresponding to libnetwork changes.
...
Signed-off-by: Pradip Dhara <pradipd@microsoft.com >
Upstream-commit: 41071d6648fe5b4649354e806543b9520af45383
Component: engine
2017-11-30 13:03:30 -08:00
Pradip Dhara
553ad48935
vndr libnetwork 64ae58878fc8f95e4a167499d654e13fa36abdc7
...
Signed-off-by: Pradip Dhara <pradipd@microsoft.com >
Upstream-commit: 7de313ac4ec2084aca6c91efc3124b9dbffc5f1a
Component: engine
2017-11-30 13:02:56 -08:00
Sebastiaan van Stijn
a8cf119f39
Merge pull request #35516 from mlaventure/reduce-race-on-exit
...
Add missing lock in ProcessEvent
Upstream-commit: 9d00efb533d3561220d169a86ca9ff965f9a6b2c
Component: engine
2017-11-30 11:30:51 -08:00
Yong Tang
4d4ec05575
Merge pull request #35533 from AliyunContainerService/supress-warning-healthcheck-none
...
Suppress warning when NONE was set for healthcheck
Upstream-commit: 29d6aef3930bf2ba815e27f4507f035a7fb5ba6c
Component: engine
2017-11-30 11:06:05 -08:00
Yong Tang
a620b9f6fd
Merge pull request #35496 from cpuguy83/add_timeouts_to_splunk_post
...
Set timeout on splunk batch send
Upstream-commit: 88e36dcc76c08d13fd83f91fa7dbe4a6ff4c83b8
Component: engine
2017-11-30 09:47:48 -08:00
Michael Crosby
87f648cd90
Merge pull request #35618 from kolyshkin/mkdir-all
...
Fix MkdirAll* and its usage
Upstream-commit: 72e45fd54e13256c813fdb39b18e26a0de980733
Component: engine
2017-11-30 11:19:29 -05:00
Michael Crosby
9d718a77b7
Merge pull request #35614 from mlaventure/remove-exec-bypid
...
Remove ByPid from ExecCommands
Upstream-commit: edbf7d8ed41a88d34dd9ad249ac94f095e0d3385
Component: engine
2017-11-30 11:17:42 -05:00
Michael Crosby
d99ad61b69
Update containerd to 6bff39c643886dfa3d546e83a90a5
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: c2cb302d1701e0de35930671f61e5d267fcb3e01
Component: engine
2017-11-30 11:16:25 -05:00
Michael Crosby
ad76847e4b
Update daemon code for containerd API changes
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: aa3ce07c41e0da9331f0659f28fed7f35846556c
Component: engine
2017-11-30 09:55:03 -05:00
Igor Karpovich
c4cb5e12ad
Logentries line-only logopt fix to maintain backwards compatibility
...
Changed logic to ignore empty value
Fixes #35626
Signed-off-by: Igor Karpovich <igor@karpovich.me >
Upstream-commit: 27a5b878c149fd70ca1e0beebda58edcc19abc73
Component: engine
2017-11-30 13:03:16 +00:00
Tõnis Tiigi
a88b24bfeb
Merge pull request #35483 from thaJeztah/disallow-nfs-backing-for-overlay
...
Disallow overlay/overlay2 on top of NFS
Upstream-commit: bdd9668b489c65eb1ef7272d38ad877ffda2041c
Component: engine
2017-11-29 19:24:58 -08:00
Yong Tang
1072fa08f7
Merge pull request #35634 from fcrisciani/fix-net-not-found
...
Restore error type in FindNetwork
Upstream-commit: e0b3ddd4377b9539e6112e57777f4c7b1d0bfc08
Component: engine
2017-11-29 16:26:26 -08:00
Michael Crosby
d9f34cfcb3
Update containerd to 59bd1967112885c4d49e510e55701
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 5bd902b5cfbb360915b02fc2a787ae9e1c183405
Component: engine
2017-11-29 19:15:14 -05:00
Akihiro Suda
3e4063cddb
Merge pull request #35501 from cpuguy83/lock_while_stopping_healthcheck
...
Fix some issues with locking on the container
Upstream-commit: 3d80a692d146e10282bacc0dd2698ffd32dcdaae
Component: engine
2017-11-30 09:01:31 +09:00
Victor Vieux
006ed302fe
Merge pull request #35527 from thaJeztah/feature-detect-overlay2
...
Detect overlay2 support on pre-4.0 kernels
Upstream-commit: 11e07e7da6023b872788b1e05f83e147f0984fb2
Component: engine
2017-11-29 13:51:26 -08:00
Flavio Crisciani
ea17d4a2f5
Restore error type in FindNetwork
...
The error type libnetwork.ErrNoSuchNetwork is used in the controller
to retry the network creation as a managed network though the manager.
The change of the type was breaking the logic causing the network to
not being created anymore so that no new container on that network
was able to be launched
Added unit test
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com >
Upstream-commit: 51cea0a53c2fd36832277402e9faac81bfb4abd4
Component: engine
2017-11-29 11:22:57 -08:00
Yong Tang
5a1411dbf0
Merge pull request #35606 from cbirajdar/master
...
added more awesome and notable women to names-generator.go
Upstream-commit: c8441b186e8bc5d7994a922782cc3b6e2c462893
Component: engine
2017-11-28 21:37:17 -08:00
Yong Tang
1901e3d893
Merge pull request #35619 from Microsoft/jjh/testrunservicingcontainer
...
Disable TestRunServicingContainer on RS4+ builds
Upstream-commit: 99e4eb103d67422ff10809079e2b810cd3dfce99
Component: engine
2017-11-28 21:34:15 -08:00
Yong Tang
856222b133
Merge pull request #35620 from fcrisciani/libnetwork-vendoring
...
Libnetwork vendoring
Upstream-commit: 235c10573612d856300ffeb5c05ac0ca343609a6
Component: engine
2017-11-28 21:11:14 -08:00
Yong Tang
bac9dc2670
Merge pull request #35631 from Microsoft/jjh/heightwidth
...
Windows: Fix width/height swap
Upstream-commit: 29708da9077fc37554bac10b17fe0446bed07af9
Component: engine
2017-11-28 21:02:46 -08:00
Akihiro Suda
87cfb875f7
Merge pull request #34948 from euank/public-mounts
...
Fix EBUSY errors under overlayfs and v4.13+ kernels
Upstream-commit: 09eb7bcc3624f5bd70135d6d24021b40c1095b46
Component: engine
2017-11-29 12:48:39 +09:00
Akihiro Suda
a0c42a8dee
Merge pull request #35622 from asottile/update_integration_cli_docs
...
Change references from test-integration-cli to test-integration
Upstream-commit: debc1fbee8d86948deed5939bb73f2a175151fb1
Component: engine
2017-11-29 12:47:52 +09:00
Sebastiaan van Stijn
6d8eeeb431
Merge pull request #35586 from ndeloof/patch-1
...
`memory` is an int64 (long)
Upstream-commit: 9243c28ba541281eaba43e51658f8dd032679ebc
Component: engine
2017-11-28 16:32:04 -08:00
Anusha Ragunathan
0569c43fe3
Merge pull request #35632 from anusha-ragunathan/fix-panic
...
Fix potential panic during plugin set.
Upstream-commit: f943df7d4824424bd648d7a165e89be8a65a952e
Component: engine
2017-11-28 15:50:12 -08:00
Sargun Dhillon
877f5d0f1f
Fix bug, where copy_file_range was still calling legacy copy
...
There was a small issue here, where it copied the data using
traditional mechanisms, even when copy_file_range was successful.
Signed-off-by: Sargun Dhillon <sargun@sargun.me >
Upstream-commit: 0eac562281782257e6f69d58bcbc13fa889f1759
Component: engine
2017-11-28 14:59:56 -08:00
Sargun Dhillon
608a03b9d5
Have VFS graphdriver use accelerated in-kernel copy
...
This change makes the VFS graphdriver use the kernel-accelerated
(copy_file_range) mechanism of copying files, which is able to
leverage reflinks.
Signed-off-by: Sargun Dhillon <sargun@sargun.me >
Upstream-commit: d2b71b26604370620630d8d3f35aba75ae474f3f
Component: engine
2017-11-28 14:59:56 -08:00
Sargun Dhillon
85f5db8154
Fix copying hardlinks in graphdriver/copy
...
Previously, graphdriver/copy would improperly copy hardlinks as just regular
files. This patch changes that behaviour, and instead the code now keeps
track of inode numbers, and if it sees the same inode number again
during the copy loop, it hardlinks it, instead of copying it.
Signed-off-by: Sargun Dhillon <sargun@sargun.me >
Upstream-commit: b467f8b2ef21dc2239dcd136a29283ea6c3a0aee
Component: engine
2017-11-28 14:59:56 -08:00
