diff options
| author | Jake Hunsaker <jhunsake@redhat.com> | 2017-12-15 12:11:57 -0500 |
|---|---|---|
| committer | Bryn M. Reeves <bmr@redhat.com> | 2018-04-16 16:19:33 +0100 |
| commit | 15d7237527fe26da95070b48e7aafd0597dc245f (patch) | |
| tree | b86a21784abf879d9021319e3921aa51cdf8452d | |
| parent | b600776dd0b0b7c1dc48c0ffd547001b3a3399c0 (diff) | |
| download | sos-15d7237527fe26da95070b48e7aafd0597dc245f.tar.gz | |
[docker] Collect daemon.json for all OSes
The Red Hat packaging of docker now also supports using
/etc/docker/daemon.json for configuring docker.
This moves collect of daemon.json from being Ubuntu-only to being for
any OS installation.
Resolves: #1168
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
| -rw-r--r-- | sos/plugins/docker.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sos/plugins/docker.py b/sos/plugins/docker.py index 80b6af30..f372845c 100644 --- a/sos/plugins/docker.py +++ b/sos/plugins/docker.py @@ -36,6 +36,7 @@ class Docker(Plugin): def setup(self): self.add_copy_spec([ + "/etc/docker/daemon.json", "/var/lib/docker/repositories-*" ]) @@ -127,7 +128,6 @@ class UbuntuDocker(Docker, UbuntuPlugin): super(UbuntuDocker, self).setup() self.add_copy_spec([ "/etc/default/docker", - "/etc/docker/daemon.json", "/var/run/docker/libcontainerd/containerd/events.log" ]) |