From 075e4821dbbb6ac49b25161935a93b957fcd389a Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Thu, 6 Aug 2020 06:32:14 +0200
Subject: Use alpine edge for py3-distlib only
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Alpine 3.12 doesn't offer a version compatible with latest OpenStack
constraints. It may fix all issues when compiling Functest for arm [1].
[1] https://travis-ci.org/github/collivier/functest/jobs/715229717
Change-Id: I7f55cafff2c7a34909440c5ca1d1f641194761c9
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
docker/core/Dockerfile | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'docker/core')
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 \
--
cgit