Clean up barometer-collectd Dockerfile

By merging several of the RUN lines and executing a yum cleanup all
at the end of the dependency installation, the resulting container
image will be around 300MB smaller.

Change-Id: I63139a5283ea40ec8ea5cc3fd7aa7faddc90f3ce
Signed-off-by: Leif Madsen <lmadsen@redhat.com>

diff --git a/docker/barometer-collectd/Dockerfile b/docker/barometer-collectd/Dockerfile
index 895d3d0..41ccad0 100644 (file)
--- a/docker/barometer-collectd/Dockerfile
+++ b/docker/barometer-collectd/Dockerfile
@@ -1,24 +1,24 @@
 FROM centos:7
-RUN yum update -y
-RUN yum install -y which sudo
-RUN yum install -y git
+RUN yum update -y && \
+        yum install -y which sudo git && \
+        yum clean all && \
+        git config --global http.sslVerify false
+
 ENV DOCKER y
 ENV repos_dir /src
 ENV openstack_plugins /src/barometer/src/collectd-openstack-plugins
-RUN git config --global http.sslVerify false
 
 WORKDIR ${repos_dir}
 RUN git clone https://gerrit.opnfv.org/gerrit/barometer
 WORKDIR ${repos_dir}/barometer/systems
-RUN sh ./build_base_machine.sh
-
-RUN useradd -ms /bin/bash collectd_exec
-RUN echo "collectd_exec ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
+RUN sh ./build_base_machine.sh && \
+        useradd -ms /bin/bash collectd_exec && \
+        echo "collectd_exec ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
 
 WORKDIR ${openstack_plugins}
-RUN make
-RUN pip install --upgrade pip
-RUN pip install -r ${openstack_plugins}/collectd-openstack-plugins/requirements.txt
+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