aboutsummaryrefslogtreecommitdiffstats
path: root/docker/healthcheck
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-04-22 20:51:50 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2020-04-24 10:20:43 +0200
commitff36f7087228ebf55f0bc34cddea38271b41dbbc (patch)
treeec766dbaabda5eafcdad3460793c95cc89b61ec2 /docker/healthcheck
parentd9caba14eabdf5a9913a7b082859f6f9251cf271 (diff)
Use ujson version asked by OpenStack master requirement
It's newer than the former tag selected [1]. The version asks by OpenStack train and older cannot work vs Alpine. ImportError: Error relocating /usr/lib/python3.7/site-packages/ujson.cpython-37m-x86_64-linux-gnu.so: strreverse: symbol not found [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/healthcheck')
-rw-r--r--docker/healthcheck/Dockerfile1
1 files changed, 1 insertions, 0 deletions
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index c52e2fd69..2a20441bf 100644
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -11,6 +11,7 @@ RUN apk --no-cache add --virtual .build-deps --update \
wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \
sed -i -E /^tempest==+.*$/d upper-constraints.txt && \
sed -i -E /^kubernetes==+.*$/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 && \