Victor Vieux and GitHub
e8e8613267
Merge pull request #35514 from thaJeztah/disable-overlay-without-d_type
...
Remove support for overlay/overlay2 without d_type
Upstream-commit: bd8a9c25ee257384ca24cf32e61b6b0ef71f521d
Component: engine
2017-12-06 14:13:58 -08:00
Sebastiaan van Stijn and GitHub
7661258841
Merge pull request #35721 from dnephin/fix-swagger-spec-errors
...
Fix codegen problems in swagger spec
Upstream-commit: 7f4cf43637067d27a1035d4ff412710ead82bbab
Component: engine
2017-12-06 13:36:52 -08:00
Daniel Nephin and GitHub
02ebcae82d
Merge pull request #35146 from masaeedu/27919-removemultitypes
...
Change multi-type parameters to single type
Upstream-commit: 7db57f7fcac33583403d1d4ccf52b1c27f7e0ad1
Component: engine
2017-12-06 16:22:17 -05:00
Daniel Nephin
3ef7b79d93
Fix codegen problems in swagger spec
...
Code generation does't support multiple types
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 3648d883556e59392e3e5a05ef5de1b56b68c6fc
Component: engine
2017-12-06 13:38:45 -05:00
Sebastiaan van Stijn and GitHub
8f8bda1238
Merge pull request #35708 from schomatis/fix-set-up-dev-env-link
...
Fix link in Contributing doc
Upstream-commit: d9dbca2e19bde080f9485dc8973e9e6d571e2ee3
Component: engine
2017-12-06 10:04:01 -08:00
Yong Tang and GitHub
928454da48
Merge pull request #35714 from jhhwang4195/master
...
fixed typo (reliablity -> reliability)
Upstream-commit: 040033b89a201c8bb28fb847db994481d4a7f401
Component: engine
2017-12-06 06:00:54 -06:00
Vincent Demeester and GitHub
41a5926818
Merge pull request #35661 from ndeloof/8917
...
introduce `workingdir` option for docker exec
Upstream-commit: 5e5fadb3c0201553929d4a6ea8dc8f9d8a1e56fe
Component: engine
2017-12-06 12:40:25 +01:00
Sebastiaan van Stijn and GitHub
1ffad27f0c
Merge pull request #35376 from KingEmet/master
...
Permit a broader range of errors from mirror endpoints when determining whether to fall back
Upstream-commit: 4055bfb3d3031de7077406ddf0f7e529c47852a9
Component: engine
2017-12-06 01:23:00 -08:00
Nicolas De Loof
2990f42efe
test case to check « exec » works as expected
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com >
Upstream-commit: 39d5ace6e1c8f3f7a008fcdf328592bfa799a243
Component: engine
2017-12-06 07:42:57 +01:00
Akihiro Suda and GitHub
8d97955cea
Merge pull request #35603 from ericsoderstrom/master
...
Update docs to reflect working directory name change.
Upstream-commit: a235469f456d6eb869b98c6ede19f2a0763d5580
Component: engine
2017-12-06 10:15:16 +09:00
Jihyun Hwang
0ec86524ed
fixed typo (reliablity -> reliability)
...
Signed-off-by: Jihyun Hwang <jhhwang@telcoware.com >
Upstream-commit: 518c50c9b21225ee991d5147cccb687ea8640afc
Component: engine
2017-12-06 09:51:53 +09:00
Yong Tang and GitHub
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 and GitHub
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 and GitHub
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 and GitHub
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
Lucas Molas and GitHub
abf2603ea4
Fix link in Contributing doc
...
Signed-off-by: Lucas Molas <lmolas@fundacionsadosky.org.ar >
Upstream-commit: 1f0572fd1a28d2b5b4566156fa449bb709362b38
Component: engine
2017-12-05 12:31:02 -03: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 and dungeonmaster18
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
Sebastiaan van Stijn
0c8a47d019
Allow existing setups to continue using d_type
...
Even though it's highly discouraged, there are existing
installs that are running overlay/overlay2 on filesystems
without d_type support.
This patch allows the daemon to start in such cases, instead of
refusing to start without an option to override.
For fresh installs, backing filesystems without d_type support
will still cause the overlay/overlay2 drivers to be marked as
"unsupported", and skipped during the automatic selection.
This feature is only to keep backward compatibility, but
will be removed at some point.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 0a4e793a3da9ba6d20bccfb83f7c48e20a76d895
Component: engine
2017-12-04 18:41:25 -08:00
Yong Tang and GitHub
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
Sebastiaan van Stijn
e4dde67875
Remove support for overlay/overlay2 without d_type
...
Support for running overlay/overlay2 on a backing filesystem
without d_type support (most likely: xfs, as ext4 supports
this by default), was deprecated for some time.
Running without d_type support is problematic, and can
lead to difficult to debug issues ("invalid argument" errors,
or unable to remove files from the container's filesystem).
This patch turns the warning that was previously printed
into an "unsupported" error, so that the overlay/overlay2
drivers are not automatically selected when detecting supported
storage drivers.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 0abb8dec3f730f3ad2cc9a161c97968a6bfd0631
Component: engine
2017-12-04 17:10:20 -08:00
Sebastiaan van Stijn
403fcf5047
Perform fsmagic detection on driver's home-dir if it exists
...
The fsmagic check was always performed on "data-root" (`/var/lib/docker`),
not on the storage-driver's home directory (e.g. `/var/lib/docker/<somedriver>`).
This caused detection to be done on the wrong filesystem in situations
where `/var/lib/docker/<somedriver>` was a mount, and a different
filesystem than `/var/lib/docker` itself.
This patch checks if the storage-driver's home directory exists, and only
falls back to `/var/lib/docker` if it doesn't exist.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: f9c8fa305e1501d8056f8744cb193a720aab0e13
Component: engine
2017-12-04 17:10:07 -08:00
Jake Sanders
8a469be8e0
fix golint errors
...
Signed-off-by: Jake Sanders <jsand@google.com >
Upstream-commit: e04375fb8c2f08da158cce21c1591d39d2e68242
Component: engine
2017-12-04 16:44:03 -08: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 and GitHub
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 and GitHub
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 and GitHub
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 and GitHub
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 and GitHub
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
Nicolas De Loof
148bfd3114
introduce workingdir option for docker exec
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com >
Upstream-commit: 19f2749d3906707717aeec9da27c499bcdc07da8
Component: engine
2017-12-01 09:06:07 +01:00
Jake Sanders
559fcde9d4
Disambiguate mirror -> other endpoint fallbacks from V2 -> V1
...
Signed-off-by: Jake Sanders <jsand@google.com >
Upstream-commit: 305801f58f22c9a26bc05eaa800e399afb212fe3
Component: engine
2017-11-30 20:01:03 -08:00
Victor Vieux and GitHub
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 and GitHub
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 and GitHub
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 and GitHub
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 and GitHub
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 and GitHub
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 and GitHub
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
Victor VieuxandGitHub
Sebastiaan van StijnandGitHub
Daniel NephinandGitHub
Daniel Nephin
Yong TangandGitHub
Vincent DemeesterandGitHub
Nicolas De Loof
Akihiro SudaandGitHub
Jihyun Hwang
Lucas MolasandGitHub
Michael Crosby
Umesh Yadavanddungeonmaster18
Brian Goff
Sebastiaan van Stijn
Jake Sanders
Ross Boucher
Tibor Vass
Madhu VenugopalandGitHub
Sargun Dhillon
Pradip Dhara