aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2021-04-19 14:34:10 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2021-04-19 17:56:39 +0200
commitc1a34de014f9b9d50dc9d688426aa0fda044505a (patch)
treee80988507e861d13aa29edef40238bfbd0849ec6
parent47e8590e8993edfcfab0c1dab19fc0716be11d40 (diff)
Update to Alpine 13
Change-Id: Ib7961d53223a08d593cfa549ab34a0006e31653f Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--docker/core/Dockerfile5
1 files 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 && \