diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2022-10-25 11:51:23 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2022-10-25 11:52:47 +0200 |
| commit | 55879c22390bd24e696761d4c04fea34ed5a1e87 (patch) | |
| tree | 32e8d919119172983f55dd44e6ba06f13851e4c1 | |
| parent | b506989b2d4eb7e16ddce6e917719385cdaa5599 (diff) | |
Update Alpine version to 3.16
It's the latest stable version.
https://www.alpinelinux.org/posts/Alpine-3.16.0-released.html
Change-Id: I567bf68675e8de853aeb204c97994b08f3dda6c2
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 253e17d5b10965758465b08c7d13589c4ff7d0cf)
| -rw-r--r-- | docker/core/Dockerfile | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 29723c709..a3e010536 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:3.16 ARG BRANCH=master ARG OPENSTACK_TAG=master @@ -25,9 +25,6 @@ RUN apk -U upgrade && \ 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 /^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 \ @@ -47,6 +44,7 @@ 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 && \ + mkdir -p /etc/xtesting && \ cp /src/functest/functest/ci/logging.ini /etc/xtesting/ && \ cp /src/functest/functest/ci/logging.debug.ini /etc/xtesting/ && \ bash -c "mkdir -p /var/lib/xtesting /home/opnfv" && \ |