[container][latest] Rename and update barometer-collectd-latest

[barometer.git] / docker / barometer-collectd-latest / Dockerfile

diff --git a/docker/barometer-collectd-master/Dockerfile b/docker/barometer-collectd-latest/Dockerfile
similarity index 70%
rename from docker/barometer-collectd-master/Dockerfile
rename to docker/barometer-collectd-latest/Dockerfile
index 9637a48..4c01c87 100644 (file)
--- a/docker/barometer-collectd-master/Dockerfile
+++ b/docker/barometer-collectd-latest/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 master
+ENV COLLECTD_FLAVOR latest
 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
@@ -31,15 +30,11 @@ COPY . ${repos_dir}/barometer
 
 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-master/run_collectd.sh /run_collectd.sh
+COPY docker/barometer-collectd-latest/run_collectd.sh /run_collectd.sh
 RUN chmod +x /run_collectd.sh
 
 ENTRYPOINT ["/run_collectd.sh"]