diff options
author | Emma Foley <efoley@redhat.com> | 2020-11-18 16:42:39 +0000 |
---|---|---|
committer | Emma Foley <efoley@redhat.com> | 2020-11-19 13:41:50 +0000 |
commit | 53f164dab619c11dc463510c2c9b58d485b91db6 (patch) | |
tree | 3e88e2f36d5884578632482197f65f51a58cdb2d /docker/barometer-collectd-experimental/Dockerfile | |
parent | 5560c122f820a8a5ecabc4c24a6e9fd444163910 (diff) |
[container][experimental] Update experimental container
* Use CentOS 8 instead of CentOS7
* Remove collectd-openstack-plugins
* Update the list of PRs that are applied
logparser and capabilities were merged
* Move the experimental configs to collectd_sample_configs{,-latest}
Change-Id: Ic1133ee7172e092ad4713c94886f306bc4d8e6ec
Signed-off-by: Emma Foley <efoley@redhat.com>
Diffstat (limited to 'docker/barometer-collectd-experimental/Dockerfile')
-rw-r--r-- | docker/barometer-collectd-experimental/Dockerfile | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/docker/barometer-collectd-experimental/Dockerfile b/docker/barometer-collectd-experimental/Dockerfile index 49016d9b..798868ff 100644 --- a/docker/barometer-collectd-experimental/Dockerfile +++ b/docker/barometer-collectd-experimental/Dockerfile @@ -13,17 +13,16 @@ # 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 COLLECTD_FLAVOR experimental ENV WITH_DPDK y ENV repos_dir /src -ENV openstack_plugins /src/barometer/src/collectd-openstack-plugins WORKDIR ${repos_dir} RUN mkdir -p ${repos_dir}/barometer @@ -38,14 +37,10 @@ COPY docker/barometer-collectd-experimental/experimental-configs/* \ WORKDIR ${repos_dir}/barometer/systems RUN sh ./build_base_machine.sh && \ + dnf clean all && rm -rf /var/cache/dnf && \ 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 docker/barometer-collectd-experimental/run_collectd.sh /run_collectd.sh RUN chmod +x /run_collectd.sh |