Anshul Pundir
739c4cc6b2
Validate/sanitize swarmkit spec name.
...
Signed-off-by: Anshul Pundir <anshul.pundir@docker.com>
2017-12-06 11:55:04 -08:00
Daniel Nephin
3648d88355
Fix codegen problems in swagger spec
...
Code generation does't support multiple types
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-12-06 13:38:45 -05:00
Sebastiaan van Stijn
d9dbca2e19
Merge pull request #35708 from schomatis/fix-set-up-dev-env-link
...
Fix link in Contributing doc
2017-12-06 10:04:01 -08:00
Boaz Shuster
8f65bb6d90
Add a debug message when client closes websocket attach connection
...
When the client closes websocket connections that sends container
output through websocket, an error message is displayed:
"Error attaching websocket: %!s(<nil>)"
This message is misleading. Thus, this change suggests to check
if error is nil and print the correct message accordingly.
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
2017-12-06 16:57:41 +02:00
Yong Tang
040033b89a
Merge pull request #35714 from jhhwang4195/master
...
fixed typo (reliablity -> reliability)
2017-12-06 06:00:54 -06:00
Vincent Demeester
5e5fadb3c0
Merge pull request #35661 from ndeloof/8917
...
introduce `workingdir` option for docker exec
2017-12-06 12:40:25 +01:00
Sebastiaan van Stijn
4055bfb3d3
Merge pull request #35376 from KingEmet/master
...
Permit a broader range of errors from mirror endpoints when determining whether to fall back
2017-12-06 01:23:00 -08:00
Nicolas De Loof
39d5ace6e1
test case to check « exec » works as expected
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2017-12-06 07:42:57 +01:00
Akihiro Suda
a235469f45
Merge pull request #35603 from ericsoderstrom/master
...
Update docs to reflect working directory name change.
2017-12-06 10:15:16 +09:00
Jihyun Hwang
518c50c9b2
fixed typo (reliablity -> reliability)
...
Signed-off-by: Jihyun Hwang <jhhwang@telcoware.com>
2017-12-06 09:51:53 +09:00
Anshul Pundir
c5c779adc8
Change TestSwarmServiceTTY to only verify running containers since with swarmkit#b187b24 service deletions/scale-downs don't directly remove the container.
...
Signed-off-by: Anshul Pundir <anshul.pundir@docker.com>
2017-12-05 14:51:14 -08:00
Anshul Pundir
9fdbb32fce
Swarmkit vendoring.
...
Signed-off-by: Anshul Pundir <anshul.pundir@docker.com>
2017-12-05 14:27:49 -08:00
Yong Tang
c7dd58ffbf
Merge pull request #35695 from boucher/upgrade-criu
...
Update CRIU version in the shell Dockerfile
2017-12-05 15:49:02 -06:00
Yong Tang
7a14e267d6
Merge pull request #35707 from crosbymichael/ctd-1.0
...
Update to containerd v1.0.0
2017-12-05 14:02:23 -06:00
Sebastiaan van Stijn
27506b3530
Merge pull request #35700 from cpuguy83/plugin_store_rm_test
...
Add test to check for plugin mounts on remove
2017-12-05 10:54:04 -08:00
Sebastiaan van Stijn
3461289bf0
Merge pull request #35529 from dungeonmaster18/subsecond-precision-config
...
Added SubSecondPrecision to config option.
2017-12-05 10:14:14 -08:00
Lucas Molas
1f0572fd1a
Fix link in Contributing doc
...
Signed-off-by: Lucas Molas <lmolas@fundacionsadosky.org.ar>
2017-12-05 12:31:02 -03:00
Michael Crosby
a27abc619c
Fix event filters
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-12-05 09:55:33 -05:00
Michael Crosby
18a53d0374
Update containerd to v1.0.0
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-12-05 09:44:42 -05:00
Umesh Yadav
a1ebda09ba
Added SubSecondPrecision flag in fluentd logger
...
Signed-off-by: dungeonmaster18 <umesh4257@gmail.com>
2017-12-05 17:21:57 +05:30
Brian Goff
5017b5bef5
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>
2017-12-04 22:01:14 -05:00
Sebastiaan van Stijn
0a4e793a3d
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>
2017-12-04 18:41:25 -08:00
Yong Tang
4047cede65
Merge pull request #35537 from sargun/vfs-use-copy_file_range
...
Have VFS graphdriver use accelerated in-kernel copy
2017-12-04 19:34:56 -06:00
Sebastiaan van Stijn
0abb8dec3f
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>
2017-12-04 17:10:20 -08:00
Sebastiaan van Stijn
f9c8fa305e
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>
2017-12-04 17:10:07 -08:00
Jake Sanders
e04375fb8c
fix golint errors
...
Signed-off-by: Jake Sanders <jsand@google.com>
2017-12-04 16:44:03 -08:00
Ross Boucher
f01d2029bb
Update CRIU github repository
...
Signed-off-by: Ross Boucher <rboucher@gmail.com>
2017-12-04 18:51:08 -05:00
Ross Boucher
7ffae3d51a
CRIU needs a newer version to work with the updates pulled in by containerd 1.0
...
Signed-off-by: Ross Boucher <rboucher@gmail.com>
2017-12-04 17:45:04 -05:00
Brian Goff
20a42b1f56
Merge pull request #35693 from crosbymichael/ctd-rc0
...
Update containerd to rc0 +
2017-12-04 16:49:29 -05:00
Michael Crosby
97b0a9d5f1
Fix nonewmountns for containerd options
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-12-04 14:17:30 -05:00
Michael Crosby
ad2b34f205
Bump containerd to cc969fb42f427a68a8cc6870ef47f17
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-12-04 14:14:42 -05:00
Sebastiaan van Stijn
d94164867c
Merge pull request #35687 from tiborvass/add-derek-bot
...
project: try alexellis/derek bot to manage PRs and issues
2017-12-04 09:54:02 -08:00
Tibor Vass
123cb95907
project: try alexellis/derek bot to manage PRs and issues
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2017-12-04 16:11:41 +01:00
Yong Tang
7ef9266ba0
Merge pull request #35600 from nictuku/go_option
...
Set a go_package on api/types/swarm/runtime to make it Bazel compatible
2017-12-01 17:30:12 -08:00
Daniel Nephin
ac68411f85
Merge pull request #35578 from thaJeztah/fix-portbindings-swagger
...
Fix PortBindings definition in Swagger
2017-12-01 17:46:38 -05:00
Madhu Venugopal
4bb2c2402d
Merge pull request #35422 from pradipd/lbfix
...
Move load balancer sandbox creation/deletion into libnetwork
2017-12-01 14:08:48 -08:00
Sargun Dhillon
77a2bc3e5b
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>
2017-12-01 09:12:43 -08:00
Nicolas De Loof
19f2749d39
introduce workingdir
option for docker exec
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2017-12-01 09:06:07 +01:00
Jake Sanders
305801f58f
Disambiguate mirror -> other endpoint fallbacks from V2 -> V1
...
Signed-off-by: Jake Sanders <jsand@google.com>
2017-11-30 20:01:03 -08:00
Victor Vieux
3a9ab941ad
Merge pull request #35628 from ikarpovich/35626-le-line-only-legacy
...
Logentries line-only logopt fix to maintain backwards compatibility
2017-11-30 15:48:56 -08:00
Yong Tang
3eb7314519
Merge pull request #35645 from crosbymichael/ctd-10
...
Update containerd to pre-1.0 rc commit
2017-11-30 15:22:01 -08:00
Pradip Dhara
791d88b853
Adding test for creating service multiple times.
...
Signed-off-by: Pradip Dhara <pradipd@microsoft.com>
2017-11-30 13:03:44 -08:00
Pradip Dhara
41071d6648
docker changes corresponding to libnetwork changes.
...
Signed-off-by: Pradip Dhara <pradipd@microsoft.com>
2017-11-30 13:03:30 -08:00
Pradip Dhara
7de313ac4e
vndr libnetwork 64ae58878fc8f95e4a167499d654e13fa36abdc7
...
Signed-off-by: Pradip Dhara <pradipd@microsoft.com>
2017-11-30 13:02:56 -08:00
Sebastiaan van Stijn
9d00efb533
Merge pull request #35516 from mlaventure/reduce-race-on-exit
...
Add missing lock in ProcessEvent
2017-11-30 11:30:51 -08:00
Yong Tang
29d6aef393
Merge pull request #35533 from AliyunContainerService/supress-warning-healthcheck-none
...
Suppress warning when NONE was set for healthcheck
2017-11-30 11:06:05 -08:00
Yong Tang
88e36dcc76
Merge pull request #35496 from cpuguy83/add_timeouts_to_splunk_post
...
Set timeout on splunk batch send
2017-11-30 09:47:48 -08:00
Michael Crosby
72e45fd54e
Merge pull request #35618 from kolyshkin/mkdir-all
...
Fix MkdirAll* and its usage
2017-11-30 11:19:29 -05:00
Michael Crosby
edbf7d8ed4
Merge pull request #35614 from mlaventure/remove-exec-bypid
...
Remove ByPid from ExecCommands
2017-11-30 11:17:42 -05:00
Michael Crosby
c2cb302d17
Update containerd to 6bff39c643886dfa3d546e83a90a5
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-11-30 11:16:25 -05:00