Update Dockerfile

- Update pip version. The version of pip which is installed
by apt-get is too low.

- use "pip install -r reuirements.txt" to install requirements
package.

Change-Id: I94f94cab58cdb0d8e926c5dfbdbf9c9a66545dac
Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 187fbc9..aea1e99 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -13,13 +13,7 @@ RUN \
         apt-transport-https \
         --no-install-recommends \
 && \
-    apt-get update &&  apt-get -y install docker.io \
-&& \
-    pip install pbr \
-        pyyaml \
-        click \
-        jinja2 \
-        six
+    apt-get update &&  apt-get -y install docker.io
 
 ENV HOME /home/opnfv
 ENV REPOS_DIR ${HOME}/dovetail
@@ -31,6 +25,10 @@ RUN \
     git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/dovetail.git ${REPOS_DIR} \
 && \
     mkdir -p ${REPOS_DIR}/results \
+&& \
+    pip install -U pip \
+&& \
+    pip install -r ${REPOS_DIR}/requirements.txt \
 && \
     cd ${REPOS_DIR} \
 && \