diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/collectd/Dockerfile.j2 | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index baa1169da..06e7b3693 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -213,24 +213,24 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 {% endblock %} {% set base_centos_yum_repo_keys = [ + '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools', ] %} # FIXME(mgoddard): Not available for CentOS 8 yet. {% if distro_package_manager == 'yum' %} {% set base_centos_yum_repo_keys = base_centos_yum_repo_keys + [ - '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools', '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage', '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization', ] %} {% endif %} {% set base_centos_yum_repo_packages = [ + 'centos-release-opstools', 'epel-release', ] %} # FIXME(mgoddard): Not available for CentOS 8 yet. {% if distro_package_manager == 'yum' %} {% set base_centos_yum_repo_packages = base_centos_yum_repo_packages + [ 'centos-release-ceph-nautilus', - 'centos-release-opstools', 'centos-release-qemu-ev', ] %} # FIXME(mnasiadka): Replace with CentOS Storage SIG packages when avail diff --git a/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2 index f5ae054ea..f35081574 100644 --- a/docker/collectd/Dockerfile.j2 +++ b/docker/collectd/Dockerfile.j2 @@ -27,9 +27,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'collectd-dbi', 'collectd-disk', 'collectd-dns', + 'collectd-dpdk_telemetry', 'collectd-generic-jmx', 'collectd-ipmi', 'collectd-log_logstash', + 'collectd-logparser', 'collectd-mcelog', 'collectd-memcachec', 'collectd-mysql', |