From ff36f7087228ebf55f0bc34cddea38271b41dbbc 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 master 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]. 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 (cherry picked from commit 743235f280b675cab39adb15de8bcea215a1c038) --- docker/core/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker/core') diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 6c8165a74..4b873bd05 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -17,7 +17,7 @@ RUN apk --no-cache add --update \ sed -i -E /#egg=functest/d upper-constraints.opnfv.txt && \ sed -i -E /^tempest==+.*$/d upper-constraints.txt && \ sed -i -E /^kubernetes==+.*$/d upper-constraints.txt && \ - sed -i -E s/^ujson==+.*$/-e\ git+https:\\/\\/github.com\\/esnme\\/ultrajson@$UJSON_TAG#egg=ujson/ upper-constraints.txt && \ + sed -i -E /^ujson==+.*$/d upper-constraints.txt && \ pip3 install --no-cache-dir --src /src -cupper-constraints.opnfv.txt -cupper-constraints.txt \ -e git+https://opendev.org/openstack/requirements@$OPENSTACK_TAG#egg=openstack_requirements && \ git init /src/functest && \ -- cgit 1.2.3-korg