diff options
author | Jose Lausuch <jose.lausuch@ericsson.com> | 2017-07-11 08:09:11 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-07-11 08:09:11 +0000 |
commit | 451dc20e8da42f0aaff9b563d08b4c4abab67b33 (patch) | |
tree | b5ba0e7620d452917a95f26de95caad0a2aafef7 /docker/core/Dockerfile | |
parent | 38415929779dff830fa73835a6e5755476b30559 (diff) | |
parent | bde3bcb27574b5ace25021de5ed2303161995cc9 (diff) |
Merge "Add upper-constraints.txt for Functest"
Diffstat (limited to 'docker/core/Dockerfile')
-rw-r--r-- | docker/core/Dockerfile | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 4f3210d7c..4aa9e5c41 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,5 +1,6 @@ FROM alpine:3.6 +COPY upper-constraints.txt upper-constraints.txt RUN apk --no-cache add --update \ python libffi libssl1.0 libjpeg-turbo py-pip bash \ grep sed wget ca-certificates git && \ @@ -8,12 +9,10 @@ RUN apk --no-cache add --update \ openssl-dev libjpeg-turbo-dev && \ wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata | \ sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ \ - > upper-constraints.txt && \ - pip install --src /src -cupper-constraints.txt \ - git+https://gerrit.opnfv.org/gerrit/releng#egg=opnfv\&subdirectory=modules \ - git+https://gerrit.opnfv.org/gerrit/snaps#egg=snaps \ + > o-upper-constraints.txt && \ + pip install --src /src -cupper-constraints.txt -co-upper-constraints.txt \ git+https://gerrit.opnfv.org/gerrit/functest#egg=functest && \ - rm upper-constraints.txt && \ + rm upper-constraints.txt o-upper-constraints.txt && \ mkdir -p /etc/rally && \ printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \ mkdir -p /var/lib/rally/database && rally-manage db create && \ |