aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2022-10-27 15:22:47 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2022-10-27 15:22:47 +0200
commit7d27247c1f48ac7b371bfca726b613257d1974df (patch)
tree42ac8ac86b685a03d88b3549ad68cbe7fad949f5
parentad83b91a1668547ebb7212d4c788118215f02566 (diff)
Stop install distlib via packages
Change-Id: I2a98204da9875186be648c120474834216fffe93 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--docker/core/Dockerfile3
1 files changed, 0 insertions, 3 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index cf64d48e7..c4d8de309 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -14,8 +14,6 @@ RUN apk -U upgrade && \
python3-dev build-base linux-headers libffi-dev \
openssl-dev libjpeg-turbo-dev rust cargo \
libxml2-dev libxslt-dev && \
- apk --no-cache add --update py3-distlib\>=0.3.1 \
- --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main && \
git init /src/requirements && \
(cd /src/requirements && \
git fetch --tags https://review.opendev.org/openstack/requirements $OPENSTACK_TAG && \
@@ -25,7 +23,6 @@ RUN apk -U upgrade && \
git fetch --tags https://gerrit.opnfv.org/gerrit/functest $BRANCH && \
git checkout FETCH_HEAD) && \
sed -i -E /^tempest==+.*$/d /src/requirements/upper-constraints.txt && \
- sed -i -E /^distlib=/d /src/requirements/upper-constraints.txt && \
case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d /src/requirements/upper-constraints.txt && apk add --no-cache py3-pynacl ;; esac && \
sed -i -E /#egg=functest/d /src/functest/upper-constraints.txt && \
pip3 install --use-deprecated=legacy-resolver --no-cache-dir --src /src -c/src/functest/upper-constraints.txt -c/src/requirements/upper-constraints.txt \