diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-02-17 00:10:07 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-02-17 00:10:07 +0100 |
| commit | 7fcc3662120b04b2c76ca40d8c4c660a2110b615 (patch) | |
| tree | 8ea218c7d6f846d31c7ab11e3b72f55bbc223f62 /docker/core/Dockerfile | |
| parent | d338103023b7d59f1a23200dafcf28c40a0d3d36 (diff) | |
Bypass upstream requirement issues
https://review.opendev.org/#/c/708041/
Change-Id: Iebbf0a720fe9d1c62083028d0bc0078bf7680753
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/core/Dockerfile')
| -rw-r--r-- | docker/core/Dockerfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 7d66e3b10..078d28742 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.11 ARG BRANCH=master -ARG OPENSTACK_TAG=master +ARG OPENSTACK_TAG=1843927ab31a6cc8b4313f786175da3ea2767a00 RUN apk --no-cache add --update \ python3 libffi openssl libjpeg-turbo py3-pip bash \ @@ -9,7 +9,7 @@ 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 && \ + wget -q -O- https://opendev.org/openstack/requirements/raw/commit/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \ case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d upper-constraints.txt && apk add --no-cache 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 && \ |