summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-09-20 21:02:23 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2017-09-20 22:26:33 +0200
commit61062b0c0d47c0e7a5b548838885b06d425191ca (patch)
tree7f562e0e22f993818312c0800f83d8c0b4c4dd8d /docker
parent4274fb8f03cf3c9b94c5e24a074f65fcf467bd38 (diff)
Add python3-dev and python3-pip in former Dockerfile
Otherwise the former container cannot be built as Doctor requires a full updated python3 env. Change-Id: Ic90c13abad33e7cb15e7e51dcaac83b9ddf3930b Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 95ffa691887b35cd60d287f13d8633094110d78e)
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile5
1 files changed, 4 insertions, 1 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 1a8089b81..2e59adad6 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -52,6 +52,8 @@ python-dev \
python-mock \
python-pip \
python3 \
+python3-dev \
+python3-pip \
postgresql \
ruby \
ruby-dev \
@@ -62,6 +64,7 @@ wget \
--no-install-recommends
RUN pip install --upgrade pip && easy_install -U setuptools==30.0.0
+RUN python3 -m pip install --upgrade pip setuptools==30.0.0
RUN mkdir -p ${REPOS_VNFS_DIR} \
&& mkdir -p ${FUNCTEST_BASE_DIR}/results \
@@ -92,7 +95,7 @@ RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/uppe
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest \
-rthirdparty-requirements.txt && \
- python3 -m pip install --no-cache-dir --src /src \
+ python3 -m pip install --src /src \
-chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
doctor-tests && \