From 61062b0c0d47c0e7a5b548838885b06d425191ca Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Wed, 20 Sep 2017 21:02:23 +0200 Subject: [PATCH] Add python3-dev and python3-pip in former Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Otherwise the former container cannot be built as Doctor requires a full updated python3 env. Change-Id: Ic90c13abad33e7cb15e7e51dcaac83b9ddf3930b Signed-off-by: Cédric Ollivier (cherry picked from commit 95ffa691887b35cd60d287f13d8633094110d78e) --- docker/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 && \ -- 2.16.6