aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorYujun Zhang <zhang.yujunz@zte.com.cn>2017-11-29 16:40:39 +0800
committerYujun Zhang <zhang.yujunz@zte.com.cn>2017-12-04 11:12:27 -0800
commitf7882526b299e0e9185b1f61d3306b48d9ec28e6 (patch)
tree990921bee916d3553661b6656c247717b42c5c91 /docker
parent795221ce0cbd9daf23af9f3099e29c947bcad306 (diff)
Use pipenv instead of pip
pipenv[1] is the officially recommended Python packaging tool from Python.org[2] [1]: https://docs.pipenv.org/ [2]: https://packaging.python.org/new-tutorials/installing-and-using-packages/ It integrates pip with virtualenv and handles version management better than pip. Change-Id: I4ec6436e29d76a866b56caa609e2bcd22489ae9f Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile9
1 files changed, 6 insertions, 3 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 0405aa45..5d93d591 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -40,13 +40,16 @@ RUN apt-get update && apt-get install -y \
--no-install-recommends \
&& rm -rf /var/lib/apt/lists/*
-RUN pip install -U pip && pip install -U setuptools
+RUN locale-gen en_US en_US.UTF-8 \
+ && pip install -U pip \
+ && pip install -U setuptools
#Cloning Repos
RUN git config --global http.sslVerify false \
&& git clone -b $BRANCH https://gerrit.opnfv.org/gerrit/qtip $REPOS_DIR/qtip \
&& cd $REPOS_DIR/qtip \
- && pip install -U -e .
+ && pip install pipenv \
+ && pipenv install --system
RUN echo 'eval $(ssh-agent)' >> /root/.bashrc
@@ -54,7 +57,7 @@ RUN echo 'eval $(ssh-agent)' >> /root/.bashrc
EXPOSE 5000
#Config supervisor
-RUN mkdir -p /var/log/supervisor && locale-gen en_US en_US.UTF-8
+RUN mkdir -p /var/log/supervisor
COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
CMD ["/usr/bin/supervisord"] \ No newline at end of file