From c1a34de014f9b9d50dc9d688426aa0fda044505a Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Mon, 19 Apr 2021 14:34:10 +0200 Subject: Update to Alpine 13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ib7961d53223a08d593cfa549ab34a0006e31653f Signed-off-by: Cédric Ollivier --- docker/core/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 045826c0..5125a9cc 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.12 +FROM alpine:3.13 ARG BRANCH=stable/leguer ARG OPENSTACK_TAG=stable/victoria @@ -18,13 +18,14 @@ RUN apk -U upgrade && \ 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 /^packaging=/d /src/requirements/upper-constraints.txt && \ apk --no-cache add --update py3-distlib\>=0.3.1 \ --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main && \ git init /src/functest-kubernetes && \ (cd /src/functest-kubernetes && \ git fetch --tags https://gerrit.opnfv.org/gerrit/functest-kubernetes $BRANCH && \ git checkout FETCH_HEAD) && \ - pip3 install --no-cache-dir --src /src \ + pip3 install --use-deprecated=legacy-resolver --no-cache-dir --src /src \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$OPNFV_TAG \ -c/src/requirements/upper-constraints.txt \ /src/functest-kubernetes && \ -- cgit 1.2.3-korg