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/vnf | |
| 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/vnf')
| -rw-r--r-- | docker/vnf/Dockerfile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index a7dcbac7d..828afb5af 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -26,6 +26,7 @@ RUN apk --no-cache add --update \ ruby-dev g++ make libxslt-dev libxml2-dev zlib-dev libffi-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 && \ |