diff options
| author |   Jose Lausuch <jose.lausuch@ericsson.com> | 2017-07-11 08:10:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-07-11 08:10:07 +0000 |
| commit | 450953c1b29335737e3c4e65e8cd917129eb2bb7 (patch) | |
| tree | 129cc6161f38edf0888b80fd097c4b31136b639c /docker/core/Dockerfile | |
| parent | 451dc20e8da42f0aaff9b563d08b4c4abab67b33 (diff) | |
| parent | 7305131c6ba5ea0f9f077ee99d2741c5f47bddb9 (diff) | |
Merge "Download Functest's upper-constraints.txt"
Diffstat (limited to 'docker/core/Dockerfile')
| -rw-r--r-- | docker/core/Dockerfile | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 4aa9e5c41..ef9f0e2d2 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,18 +1,21 @@ FROM alpine:3.6 -COPY upper-constraints.txt upper-constraints.txt +ARG BRANCH=master +ARG OPENSTACK_TAG=stable/ocata + RUN apk --no-cache add --update \ python libffi libssl1.0 libjpeg-turbo py-pip bash \ grep sed wget ca-certificates git && \ apk --no-cache add --virtual .build-deps --update \ python-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev && \ - wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata | \ + 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/ \ - > 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 o-upper-constraints.txt && \ + > upper-constraints.txt && \ + pip install --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 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 && \ |