aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2017-09-05 10:27:51 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-05 10:27:51 +0000
commitd337aaa51d74314544c36ca30b6951cec1156d5d (patch)
tree9053b531376fda430d2be306006ccaeb0b4fc91e
parent6df95384eb26cdca150f7010bcead9e93d8aac4a (diff)
parent7a008b5843b32814ce4e42361de4596e1cb41d4d (diff)
Merge "Stop using master for pip"
-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 && \