diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2019-05-12 20:19:14 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2019-05-28 13:42:44 +0200 |
| commit | 7855e89bed6c7c90d6e4b920d4cd54a89dde0291 (patch) | |
| tree | 3066c2daab5c371283cf4cff80fc5e3279bb4c87 /docker/core/Dockerfile | |
| parent | 0440ffcac18991395799e5aafc9243e028917ab6 (diff) | |
Install PyNaCl via package
Building functest-core container sometimes reaches travis-ci timeout
[0]. It currently selects the right version in master and
stable/hunter.
[0] https://travis-ci.org/collivier/functest/jobs/531417730
Change-Id: Ie6c8e729f76c98c6f8c8e9ca01b2c998081f7ce8
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/core/Dockerfile')
| -rw-r--r-- | docker/core/Dockerfile | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 009c8874b..b4c112dee 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -10,23 +10,22 @@ RUN apk --no-cache add --update \ apk --no-cache add --virtual .build-deps --update \ python3-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev && \ + wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \ + case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d upper-constraints.txt && apk add py3-pynacl ;; esac && \ wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH > upper-constraints.opnfv.txt && \ sed -i -E /#egg=functest/d upper-constraints.opnfv.txt && \ - pip3 install --no-cache-dir --src /src -cupper-constraints.opnfv.txt \ - -chttps://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt \ + pip3 install --no-cache-dir --src /src -cupper-constraints.opnfv.txt -cupper-constraints.txt \ pip==$PIP_TAG && \ - pip3 install --no-cache-dir --src /src -cupper-constraints.opnfv.txt \ - -chttps://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt \ + pip3 install --no-cache-dir --src /src -cupper-constraints.opnfv.txt -cupper-constraints.txt \ -e git+https://opendev.org/openstack/requirements@$OPENSTACK_TAG#egg=openstack_requirements && \ git init /src/functest && \ (cd /src/functest && \ git fetch --tags https://gerrit.opnfv.org/gerrit/functest $BRANCH && \ git checkout FETCH_HEAD) && \ update-requirements -s --source /src/openstack-requirements /src/functest && \ - pip3 install --no-cache-dir --src /src -cupper-constraints.opnfv.txt \ - -chttps://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt \ + pip3 install --no-cache-dir --src /src -cupper-constraints.opnfv.txt -cupper-constraints.txt \ /src/functest && \ - rm -r upper-constraints.opnfv.txt /src/functest && \ + rm -r upper-constraints.txt upper-constraints.opnfv.txt /src/functest && \ cp /usr/lib/python3.6/site-packages/functest/ci/logging.ini /usr/lib/python3.6/site-packages/xtesting/ci/ && \ cp /usr/lib/python3.6/site-packages/functest/ci/logging.debug.ini /usr/lib/python3.6/site-packages/xtesting/ci/ && \ bash -c "mkdir -p /var/lib/xtesting /home/opnfv" && \ |