aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-08-06 06:11:50 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2020-08-06 06:11:50 +0200
commit8f4f1db7325c690427e4a461fa72497a4a91a307 (patch)
tree949ce613d5721b6c798d05baca8a058ba8bddd30
parent5bc18405d75e9d765cd707ff9a98c3553de4b0dd (diff)
Install py3-distlib from Alpine Edge
Alpine 3.12 doesn't offer a version compatible with latest OpenStack constraints [1]. [1] https://build.opnfv.org/ci/job/functest-kubernetes-opnfv-functest-kubernetes-core-latest-gate/68/console Change-Id: I70930f888d9612d44b73c5d87b9dc1663d02be1c Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--docker/core/Dockerfile3
1 files changed, 2 insertions, 1 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 1ae24dde..01845292 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -9,11 +9,12 @@ COPY Switch-to-threading.Thread-for-Rally-tasks.patch /tmp/Switch-to-threading.T
RUN apk --no-cache add --update python3 py3-pip bash git grep libffi openssl mailcap && \
apk --no-cache add --virtual .build-deps --update \
python3-dev build-base libffi-dev openssl-dev && \
+ apk --no-cache add --update --upgrade py3-distlib \
+ --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 && \
git checkout FETCH_HEAD) && \
- sed -i -E /^distlib==+.*$/d /src/requirements/upper-constraints.txt && \
git init /src/functest-kubernetes && \
(cd /src/functest-kubernetes && \
git fetch --tags https://gerrit.opnfv.org/gerrit/functest-kubernetes $BRANCH && \