diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2022-10-27 15:22:47 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2022-10-27 15:23:27 +0200 |
| commit | b87bc89f38ffabadd17bd75580b30f626582d935 (patch) | |
| tree | 61f2eb33801794ffe6b5e6f951bc1170ecb51a78 | |
| parent | 9db953f699d8aa6781a3dab60b63e928e0ba13a0 (diff) | |
Stop install distlib via packages
Change-Id: I2a98204da9875186be648c120474834216fffe93
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 7d27247c1f48ac7b371bfca726b613257d1974df)
| -rw-r--r-- | docker/core/Dockerfile | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 708346eb8..3aef50c0a 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 \ |