diff options
| author | Nick Niehoff <nick.niehoff@canonical.com> | 2020-06-04 15:04:51 -0600 |
|---|---|---|
| committer | Bryan Quigley <bryan.quigley@canonical.com> | 2020-06-05 13:32:48 -0700 |
| commit | 856d62cbfed7bafeb9176545226f6caa85785f63 (patch) | |
| tree | c5ba4b7082b8b403d336aae12732b6fba367f1d4 | |
| parent | 5d92bf688acc15eea6601682cb2970141212fdc9 (diff) | |
| download | sos-856d62cbfed7bafeb9176545226f6caa85785f63.tar.gz | |
[docker] Adding support for docker-ce/docker-ee in Ubuntu
This plugin is only executed if docker.io is installed but
if docker-ce or docker-ee from docker.com are installed this
plugin should also run.
Also collecting /etc/containerd to align with the collection
on RHEL.
Closes: #2100
Resolves: #2101
Signed-off-by: Nick Niehoff <nick.niehoff@canonical.com>
Signed-off-by: Bryan Quigley <bryan.quigley@canonical.com>
| -rw-r--r-- | sos/report/plugins/docker.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sos/report/plugins/docker.py b/sos/report/plugins/docker.py index 6b8e0804..f26960a2 100644 --- a/sos/report/plugins/docker.py +++ b/sos/report/plugins/docker.py @@ -129,11 +129,12 @@ class RedHatDocker(Docker, RedHatPlugin): class UbuntuDocker(Docker, UbuntuPlugin): - packages = ('docker.io', 'docker-engine') + packages = ('docker.io', 'docker-engine', 'docker-ce', 'docker-ee') def setup(self): super(UbuntuDocker, self).setup() self.add_copy_spec([ + "/etc/containerd/", "/etc/default/docker", "/run/docker/libcontainerd/containerd/events.log" ]) |