From 8b86dd02328e331cc01b21bf1072e515bbd6db68 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Wed, 11 Aug 2021 15:56:12 +0200 Subject: Update to Alpine 3.14 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It also disabled wrong order check as it fails vs kubernetes amongst others. [1] https://github.com/PyCQA/pylint/issues/2175 Change-Id: I3d641c213067428848212a148d25d78051c5674f Signed-off-by: Cédric Ollivier --- docker/core/Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'docker/core') diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index af6d90c5..89e54fc9 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.13 +FROM alpine:3.14 ARG BRANCH=master ARG OPENSTACK_TAG=master @@ -19,6 +19,7 @@ RUN apk -U upgrade && \ apk add --no-cache py3-pynacl ;; esac && \ sed -i -E /^six=/d /src/requirements/upper-constraints.txt && \ sed -i -E /^distlib=/d /src/requirements/upper-constraints.txt && \ + 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 && \ @@ -44,6 +45,6 @@ RUN apk -U upgrade && \ mkdir -p /var/lib/rally/database && rally db create && \ rm -r /src/requirements/.git /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch && \ apk del .build-deps -COPY logging.ini /usr/lib/python3.8/site-packages/xtesting/ci/logging.ini -COPY logging.debug.ini /usr/lib/python3.8/site-packages/xtesting/ci/logging.debug.ini +COPY logging.ini /usr/lib/python3.9/site-packages/xtesting/ci/logging.ini +COPY logging.debug.ini /usr/lib/python3.9/site-packages/xtesting/ci/logging.debug.ini CMD ["run_tests", "-t", "all"] -- cgit 1.2.3-korg