From fa15dd6e448dab90ddc6a88d8877e966b0872941 Mon Sep 17 00:00:00 2001 From: Maryam Tahhan Date: Tue, 5 Dec 2017 13:32:12 +0000 Subject: 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 --- docker/Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index b64dd805..f2005682 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 -- cgit 1.2.3-korg