From e8d81360e064faea0d6b011b0efc537035234527 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Wed, 22 Apr 2020 20:51:50 +0200 Subject: Use ujson version asked by OpenStack requirement MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit 743235f280b675cab39adb15de8bcea215a1c038) --- docker/core/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'docker/core') 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 && \ -- cgit 1.2.3-korg