From: Cédric Ollivier Date: Mon, 27 May 2019 18:47:48 +0000 (+0200) Subject: Stop downgrading pip X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F59%2F67959%2F2;p=functest.git Stop downgrading pip The pip package poposed by Alpine is fine. Change-Id: I415757b8f4028c76e9d8cec4895306d843d42ac2 Signed-off-by: Cédric Ollivier (cherry picked from commit 5819ff6a14e7e89b6c7004336bfcabed9f16baa4) --- diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 963e01b5f..86da11d84 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -2,7 +2,6 @@ FROM alpine:3.9 ARG BRANCH=stable/hunter ARG OPENSTACK_TAG=stable/rocky -ARG PIP_TAG=18.0 RUN apk --no-cache add --update \ python libffi openssl libjpeg-turbo py-pip bash \ @@ -14,8 +13,6 @@ RUN apk --no-cache add --update \ case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d upper-constraints.txt && apk add py-pynacl ;; 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 && \ - pip install --no-cache-dir --src /src -cupper-constraints.opnfv.txt -cupper-constraints.txt \ - pip==$PIP_TAG && \ pip 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 && \