diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2020-08-06 09:07:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2020-08-06 09:07:59 +0000 |
| commit | b5b2a7a3bc46956ed8c210c7fed99014a85763cd (patch) | |
| tree | e366019ee3bf5071edfa49558c6da93b90e3d9bb /docker | |
| parent | 982ec6816ccf3b96eda0fa7247841998c55afba2 (diff) | |
| parent | 075e4821dbbb6ac49b25161935a93b957fcd389a (diff) | |
Merge "Use alpine edge for py3-distlib only"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/core/Dockerfile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 1d5097868..b933af5ca 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:edge +FROM alpine:3.12 ARG BRANCH=master ARG OPENSTACK_TAG=master @@ -11,6 +11,8 @@ RUN apk --no-cache add --update \ apk --no-cache add --virtual .build-deps --update \ python3-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-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 && \ @@ -20,7 +22,6 @@ RUN apk --no-cache add --update \ 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 --no-cache-dir --src /src -c/src/functest/upper-constraints.txt -c/src/requirements/upper-constraints.txt \ |