From 2847e052aef84d97b674aee3a655c55091844925 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Wed, 11 Nov 2020 19:05:11 +0000 Subject: [container][collectd] Update barometer-collectd container for CentOS 8 Update collectd to 5.12 Add in CentOS as base for the barometer-collectd container Remove openstack plugins - they are not used anymore Use packaged DPDK (v18.11 in CentOS 7 amd v19.11 in CentOS 8) Install packages from package manager instead of building libpqos, pmu-tools and librdkafka Combine install commands into one for CentOS8 (systems/centos/8/build_base_machine.sh) These changes reduce the size of the container from 1.7GB to ~825MB. Change-Id: I7e474f9578cdbcc7cce8c4fbc5e297eab89fd371 Signed-off-by: Emma Foley --- docker/barometer-collectd/Dockerfile | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'docker') diff --git a/docker/barometer-collectd/Dockerfile b/docker/barometer-collectd/Dockerfile index 8de66c69..ad4a1579 100644 --- a/docker/barometer-collectd/Dockerfile +++ b/docker/barometer-collectd/Dockerfile @@ -13,30 +13,27 @@ # limitations under the License. # -FROM centos:7 -RUN yum update -y && \ - yum install -y which sudo git && \ - yum clean all && \ +FROM centos:8 +RUN dnf update -y && \ + dnf install -y which sudo git && \ + dnf clean all && \ git config --global http.sslVerify false ENV DOCKER y ENV WITH_DPDK y ENV COLLECTD_FLAVOR stable ENV repos_dir /src -ENV openstack_plugins /src/barometer/src/collectd-openstack-plugins WORKDIR ${repos_dir} RUN git clone https://gerrit.opnfv.org/gerrit/barometer + WORKDIR ${repos_dir}/barometer/systems RUN sh ./build_base_machine.sh && \ + dnf clean all && rm -rf /var/cache/dnf && \ + cd ${repos_dir}/ && rm -rf barometer && \ useradd -ms /bin/bash collectd_exec && \ echo "collectd_exec ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers -WORKDIR ${openstack_plugins} -RUN make && \ - pip install --upgrade pip && \ - pip install -r ${openstack_plugins}/collectd-openstack-plugins/requirements.txt - COPY run_collectd.sh /run_collectd.sh RUN chmod +x /run_collectd.sh -- cgit 1.2.3-korg