diff options
| author | Jake Hunsaker <jhunsake@redhat.com> | 2017-09-06 14:44:20 -0400 |
|---|---|---|
| committer | Bryn M. Reeves <bmr@redhat.com> | 2018-04-04 16:22:43 +0100 |
| commit | 9fc6eb234682ce695c2b1b1608f755928d441585 (patch) | |
| tree | a1226d4076423ce0bae9fb43f6faafc9aa429d8c | |
| parent | 3e4c6b9546b18b795280b13de57a40860dc6db5d (diff) | |
| download | sos-9fc6eb234682ce695c2b1b1608f755928d441585.tar.gz | |
[docker] Collect new registry config location
For the Red Hat release of docker, registries are now configured in
/etc/containers/registries.conf instead of /etc/sysconfig/docker.
This patch adds collection of /etc/containers to collect registry
configuration files. /etc/sysconfig/docker can still be used for daemon
configuration, so that is still collected.
Resolves: #1096
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
| -rw-r--r-- | sos/plugins/docker.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sos/plugins/docker.py b/sos/plugins/docker.py index 50fdc9c2..80b6af30 100644 --- a/sos/plugins/docker.py +++ b/sos/plugins/docker.py @@ -114,7 +114,8 @@ class RedHatDocker(Docker, RedHatPlugin): super(RedHatDocker, self).setup() self.add_copy_spec([ - "/etc/udev/rules.d/80-docker.rules" + "/etc/udev/rules.d/80-docker.rules", + "/etc/containers/" ]) |