summaryrefslogtreecommitdiffstats
path: root/docker/Dockerfile
diff options
context:
space:
mode:
Diffstat (limited to 'docker/Dockerfile')
-rw-r--r--docker/Dockerfile14
1 files changed, 5 insertions, 9 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 0401af71..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 \
&& \
@@ -18,7 +20,7 @@ RUN \
&& \
apt-get update
-RUN wget -qO- https://get.docker.com/ | sh
+RUN wget -qO- https://get.docker.com/ | sed 's/ docker-engine/ docker-engine=1.12.3-0~trusty/' | sh
ENV HOME /home/opnfv
ENV REPOS_DIR ${HOME}/dovetail
@@ -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