diff options
| author | christyp <christy@linux.vnet.ibm.com> | 2017-05-31 08:42:18 -0500 |
|---|---|---|
| committer | Adam Stokes <battlemidget@users.noreply.github.com> | 2017-05-31 09:42:18 -0400 |
| commit | 6594ee1786e59ed67393cb928cd728158d0bf86f (patch) | |
| tree | 9648297aeca7a8e73e7d67388c30eec1cb4c5135 | |
| parent | 6b7f1ed899e121a4bdcc578aa25c252ee8f6a46f (diff) | |
| download | sos-6594ee1786e59ed67393cb928cd728158d0bf86f.tar.gz | |
[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 <kgraul@linux.vnet.ibm.com>
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
Signed-off-by: Adam Stokes <battlemidget@users.noreply.github.com>
| -rw-r--r-- | sos/plugins/docker.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sos/plugins/docker.py b/sos/plugins/docker.py index c4d164bf..fea4b96c 100644 --- a/sos/plugins/docker.py +++ b/sos/plugins/docker.py @@ -122,13 +122,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 : |