Here's the patch from upstream project.
Author: christyp <chri...@linux.vnet.ibm.com>
Origin: upstream,
https://github.com/sosreport/sos/commit/6594ee1786e59ed67393cb928cd728158d0bf86f
Bug: https://github.com/sosreport/sos/issues/930
>From 74d62ea4a12571da98a7be421408082e85efa504 Mon Sep 17 00:00:00 2001
From: Eric Desrochers <eric.desroch...@canonical.com>
Date: Fri, 2 Jun 2017 11:27:17 -0400
Subject: [PATCH] [docker] Update Ubuntu copy spec (#1009)
The binary name changed from docker.io to docker.
Update config and log file locations.
Signed-off-by: Karsten Graul <kgr...@linux.vnet.ibm.com>
Signed-off-by: Christy Perez <chri...@linux.vnet.ibm.com>
Signed-off-by: Adam Stokes <battlemid...@users.noreply.github.com>
---
sos/plugins/docker.py | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/sos/plugins/docker.py b/sos/plugins/docker.py
index ffe5cfc..a5f74b2 100644
--- a/sos/plugins/docker.py
+++ b/sos/plugins/docker.py
@@ -113,13 +113,12 @@ class UbuntuDocker(Docker, UbuntuPlugin):
packages = ('docker.io', 'docker-engine')
- # Name collision with another package requires docker binary rename
- docker_cmd = 'docker.io'
-
def setup(self):
super(UbuntuDocker, self).setup()
self.add_copy_spec([
- "/etc/default/docker.io"
+ "/etc/default/docker",
+ "/etc/docker/daemon.json",
+ "/var/run/docker/libcontainerd/containerd/events.log"
])
# vim: set et ts=4 sw=4 :
--
2.7.4
