From ed3ec08d5caa2e76b5849fa6e212891c987eace8 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/benchmarking/Dockerfile | 1 + 1 file changed, 1 insertion(+) (limited to 'docker/benchmarking') diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile index 1cd3ba49b..06bd2b62d 100644 --- a/docker/benchmarking/Dockerfile +++ b/docker/benchmarking/Dockerfile @@ -11,6 +11,7 @@ RUN apk --no-cache add --update libxml2 libxslt && \ openssl-dev libjpeg-turbo-dev libxml2-dev libxslt-dev && \ wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \ sed -i -E /#egg=tempest/d 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 ;; 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