aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
Diffstat (limited to 'docker')
-rw-r--r--docker/barometer-collectd/Dockerfile22
1 files changed, 11 insertions, 11 deletions
diff --git a/docker/barometer-collectd/Dockerfile b/docker/barometer-collectd/Dockerfile
index 895d3d08..41ccad0b 100644
--- 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
an> # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # import functest.core.feature_base as base class Orchestra(base.FeatureBase): def __init__(self): super(Orchestra, self).__init__(project='orchestra', case='orchestra', repo='dir_repo_orchestra') # TODO # self.cmd = "%s/tests/run.sh %s/tests" % (self.repo, self.repo)