diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2021-08-12 16:41:38 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2021-08-18 09:14:02 +0200 |
| commit | 61138bfec980625bec6c219b9e27685c281e5965 (patch) | |
| tree | 85116675caadaef0c9adbf3e7c09830204cfc040 /docker/core | |
| parent | 128e7c9c093653d47182f5ad0e852087bd1e9a62 (diff) | |
Update to Alpine 3.14
It also fixes lots of new pylint warnings.
Change-Id: I3376aee5649596c53bc2941ad4d8e0674a2967fe
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/core')
| -rw-r--r-- | docker/core/Dockerfile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index cb6996f07..d955920f9 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 @@ -25,6 +25,7 @@ RUN apk -U upgrade && \ sed -i -E /^tempest==+.*$/d /src/requirements/upper-constraints.txt && \ 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 && \ 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 --use-deprecated=legacy-resolver --no-cache-dir --src /src -c/src/functest/upper-constraints.txt -c/src/requirements/upper-constraints.txt \ @@ -44,8 +45,8 @@ RUN apk -U upgrade && \ rm -r /src/requirements/.git /src/functest/.git \ /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch \ /tmp/Create-new-server-in-test_create_backup.patch && \ - cp /src/functest/functest/ci/logging.ini /usr/lib/python3.8/site-packages/xtesting/ci/ && \ - cp /src/functest/functest/ci/logging.debug.ini /usr/lib/python3.8/site-packages/xtesting/ci/ && \ + cp /src/functest/functest/ci/logging.ini /usr/lib/python3.9/site-packages/xtesting/ci/ && \ + cp /src/functest/functest/ci/logging.debug.ini /usr/lib/python3.9/site-packages/xtesting/ci/ && \ bash -c "mkdir -p /var/lib/xtesting /home/opnfv" && \ ln -s /var/lib/xtesting /home/opnfv/functest && \ bash -c "mkdir -p /home/opnfv/functest{/conf,/data,/images,/results} /home/opnfv/repos/vnfs" && \ |