diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2021-01-21 16:52:50 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2021-02-10 23:44:36 +0100 |
| commit | 8ca99d45e57aa1bb91c6b536af5f0bea382a6ba7 (patch) | |
| tree | 2bf880c817a4b96cd6c50cfcaefc46e9c2b77aad /docker/core | |
| parent | e84511b845f727d05c16340d3eb3fb512b1345c0 (diff) | |
Follow new pip name resolver
Change-Id: Ib185c90b4403a25db55ab0948c2d6bb2b2bc8dfd
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/core')
| -rw-r--r-- | docker/core/Dockerfile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 80be9ee3d..155a138f4 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.12 +FROM alpine:3.13 ARG BRANCH=master ARG OPENSTACK_TAG=master @@ -10,7 +10,7 @@ RUN apk --no-cache add --update \ grep sed wget ca-certificates git openssh-client qemu-img iputils coreutils mailcap libstdc++ && \ apk --no-cache add --virtual .build-deps --update \ python3-dev build-base linux-headers libffi-dev \ - openssl-dev libjpeg-turbo-dev && \ + openssl-dev libjpeg-turbo-dev rust cargo && \ apk --no-cache add --update py3-distlib\>=0.3.1 \ --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main && \ git init /src/requirements && \ @@ -24,10 +24,10 @@ RUN apk --no-cache add --update \ sed -i -E /^tempest==+.*$/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 --no-cache-dir --src /src -c/src/functest/upper-constraints.txt -c/src/requirements/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 \ -e /src/requirements && \ update-requirements -s --source /src/requirements /src/functest && \ - pip3 install --no-cache-dir --src /src -c/src/functest/upper-constraints.txt -c/src/requirements/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 \ -e /src/functest && \ (cd /src/rally && patch -p1 < /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch) && \ sed -i -E /#egg=rally/d /src/functest/upper-constraints.txt && \ |