summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaryam Tahhan <maryam.tahhan@intel.com>2017-12-05 13:32:12 +0000
committerMaryam Tahhan <maryam.tahhan@intel.com>2017-12-05 13:35:36 +0000
commitfa15dd6e448dab90ddc6a88d8877e966b0872941 (patch)
tree019be1c8807376b33dfe153c83ff238fe38a57d9
parenta74412c2c67815d4a42122607d3c6403f5f645ef (diff)
dockerfile: update for OPNFV docker build
The opnfv docker build runs in the docker directory not the barometer directory so it doesn't have access to the top level barometer directories that it needs to build the barometer image. This commit modifies the Dockerfile to clone the barometer repo inside the container image. Change-Id: I3518f4a64e806f69b424d24620fb13a9d45e4335 Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
-rw-r--r--docker/Dockerfile14
1 files changed, 7 insertions, 7 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index b64dd80..f200568 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,17 +1,17 @@
FROM centos:7
RUN yum update -y
RUN yum install -y which sudo
+RUN yum install -y git
ENV DOCKER y
-COPY systems /systems
-COPY src /src
-COPY 3rd_party /3rd_party
-COPY mibs /mibs
+ENV repos_dir /src
-WORKDIR /systems
+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
-WORKDIR /src
-COPY docker/run_collectd.sh /run_collectd.sh
+COPY run_collectd.sh /run_collectd.sh
RUN chmod +x /run_collectd.sh