summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2017-07-19 09:32:37 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-07-19 09:32:37 +0000
commitf190b3532263cfede083b775c1f94cab1fa027fd (patch)
tree7bebaba94a3f2de8376da39d82606eb5a1fee927
parent2f911f3f0500b3a1a0f5352282e88e2aea925a6d (diff)
parent818161ac24b2807c6931a1d7b563612b60fa5e1c (diff)
Merge "Save space in Alpine containers"
-rw-r--r--docker/core/Dockerfile2
-rw-r--r--docker/smoke/Dockerfile4
2 files changed, 3 insertions, 3 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 574de9bae..ebd76a262 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -12,7 +12,7 @@ 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 --src /src -cupper-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 && \
rm upper-constraints.txt && \
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 15ab702d0..22ff2eb3a 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -7,13 +7,13 @@ COPY thirdparty-requirements.txt thirdparty-requirements.txt
RUN apk --no-cache add --virtual .build-deps --update \
python-dev build-base linux-headers libffi-dev \
openssl-dev libjpeg-turbo-dev git && \
- pip install --src /src \
+ pip install --no-cache-dir --src /src \
-chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-rthirdparty-requirements.txt && \
ln -s /src/tempest /src/refstack-client/.tempest && \
virtualenv --system-site-packages /src/tempest/.venv && \
- rm thirdparty-requirements.txt && \
+ rm -r thirdparty-requirements.txt /src/refstack-client/.git && \
apk del .build-deps
COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml
CMD ["bash","-c","prepare_env start && run_tests -t all"]