summaryrefslogtreecommitdiffstats
path: root/docker/core
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2017-09-04 12:48:40 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-04 12:48:40 +0000
commitf17555971dc56efc9bcf198c90fb5237d9f68c9f (patch)
tree8e337806385f1812522926b4e83712ad78a79d68 /docker/core
parent8e6430da874e14dd56357d0280ffe7497c7cf40e (diff)
parentc663a483284c17f109dfede3068b28249f34a0d3 (diff)
Merge "Remove openstack-requirements from requirements.txt"
Diffstat (limited to 'docker/core')
-rw-r--r--docker/core/Dockerfile5
1 files changed, 4 insertions, 1 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 66117092b..172dbb9fa 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -15,11 +15,14 @@ RUN apk --no-cache add --update \
> upper-constraints.txt && \
pip install --no-cache-dir --src /src -cupper-constraints.txt \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
- git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest && \
+ -e git+https://github.com/openstack/requirements@stable/ocata#egg=openstack_requirements && \
git clone --depth 1 https://github.com/openstack/rally.git -b $RALLY_TAG /src/rally && \
update-requirements -s --source /src/openstack-requirements /src/rally/ && \
pip install --no-cache-dir --src /src -cupper-constraints.txt \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH /src/rally/ && \
+ pip install --no-cache-dir --src /src -cupper-constraints.txt \
+ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
+ git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest && \
rm -r upper-constraints.txt /src/rally/.git && \
mkdir -p /etc/rally && \
printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \