From 2ab5f766fe67e4251d54d5c583503324537cd8f2 Mon Sep 17 00:00:00 2001
From: MatthewLi <matthew.lijun@huawei.com>
Date: Tue, 20 Jun 2017 02:43:32 -0400
Subject: branch supported in Dockerfile and use functest/yardstick danube.2.0

JIRA: DOVETAIL-447

Change-Id: Id49d6ded8188900b58349e1983ac3fc8b40b6059
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
---
 docker/Dockerfile | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'docker')

diff --git a/docker/Dockerfile b/docker/Dockerfile
index a700a313..294f42c6 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,6 +2,8 @@ FROM ubuntu:14.04
 MAINTAINER Leo Wang <grakiss.wanglei@huawei.com>
 LABEL version="0.1" description="OPNFV Dovetail Docker Container"
 
+ARG BRANCH=master
+
 RUN \
     apt-get update \
 && \
@@ -27,15 +29,9 @@ WORKDIR /home/opnfv
 RUN \
     git config --global http.sslVerify false \
 && \
-    git clone https://git.opnfv.org/dovetail ${REPOS_DIR} \
-&& \
-    pip install -U pip \
-&& \
-    pip install -r ${REPOS_DIR}/requirements.txt \
-&& \
-    cd ${REPOS_DIR} \
+    pip install git+https://git.opnfv.org/dovetail@$BRANCH#egg=dovetail \
 && \
-    pip install -e .
+    ln -s /usr/local/lib/python2.7/dist-packages/dovetail ${REPOS_DIR}/dovetail
 
 WORKDIR ${REPOS_DIR}/dovetail
 
-- 
cgit 1.2.3-korg