summaryrefslogtreecommitdiffstats
path: root/docker/core/Dockerfile
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-07-07 22:21:37 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2017-07-10 02:03:15 +0200
commit7305131c6ba5ea0f9f077ee99d2741c5f47bddb9 (patch)
treed461b769b135d1580525ca1eff6d9a83ed1ac4c0 /docker/core/Dockerfile
parentbde3bcb27574b5ace25021de5ed2303161995cc9 (diff)
Download Functest's upper-constraints.txt
It also removes all temporarily files [1] and reuses OPENSTACK_TAG and BRANCH args. [1] https://gerrit.opnfv.org/gerrit/37077 Change-Id: Id87ffdf14ccb1a34f117241c882423adf79f44c5 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/core/Dockerfile')
-rw-r--r--docker/core/Dockerfile15
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 && \