aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-09-05 11:29:10 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2017-09-05 11:31:58 +0200
commit7a008b5843b32814ce4e42361de4596e1cb41d4d (patch)
treeda8bd03187d084bda580ac56eea5694ef9cc1be9
parent82b5b5c13ed5b08ff7191d0d1dcddfc4bd99f0c7 (diff)
Stop using master for pip
Rally cannot work via latest pip: [r.name.lower() for r in pip.req.parse_requirements( rally AttributeError: 'module' object has no attribute 'req' Badly it forbids building containers from a gerrit change. Change-Id: Ie60344b2a7793729823643ba2c1d3c30500d56c4 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--docker/core/Dockerfile3
1 files changed, 0 insertions, 3 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 0ab809aa..172dbb9f 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -13,9 +13,6 @@ RUN apk --no-cache add --update \
wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \
sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ \
> upper-constraints.txt && \
- pip install -U --no-cache-dir -cupper-constraints.txt \
- -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
- git+https://github.com/pypa/pip.git && \
pip install --no-cache-dir --src /src -cupper-constraints.txt \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-e git+https://github.com/openstack/requirements@stable/ocata#egg=openstack_requirements && \