diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-04-22 20:51:50 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-04-25 10:55:46 +0200 |
| commit | e8d81360e064faea0d6b011b0efc537035234527 (patch) | |
| tree | 9157713dd248801f6166c74e3613419b558ca949 /docker/core | |
| parent | c934fa14bff8e74e5da03bb7ef75c0063e6e03a6 (diff) | |
Use ujson version asked by OpenStack requirement
It's newer than the former tag selected [1].
[1] https://github.com/openstack/requirements/blob/master/upper-constraints.txt
Change-Id: Ie89136da364d7e972a1d7f49c71bdfbbdd9671d8
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 743235f280b675cab39adb15de8bcea215a1c038)
Diffstat (limited to 'docker/core')
| -rw-r--r-- | docker/core/Dockerfile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 583c46cec..9347021d6 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -5,11 +5,13 @@ ARG OPENSTACK_TAG=stable/stein RUN apk --no-cache add --update \ python3 libffi openssl libjpeg-turbo py3-pip bash \ - grep sed wget ca-certificates git openssh-client qemu-img iputils coreutils mailcap && \ + grep sed wget ca-certificates git openssh-client qemu-img iputils coreutils mailcap \ + libstdc++ && \ 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 && \ + sed -i -E /^ujson==+.*$/d 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 && \ |