diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2022-10-20 13:15:24 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2022-10-20 16:49:42 +0200 |
| commit | 2d735288878002bffc7b4b32a90a01e0f5881c09 (patch) | |
| tree | 205d432b0124ec735fc2bff31cf5b4b75f36e7c5 /docker | |
| parent | e9c3f49b9aa4714ef9c2be8658080f23f41dbd30 (diff) | |
Update to Alpine 3.16
Change-Id: Ib630178c93d4a991f43611796e0c07975ce421ec
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 651fbe30a574fde8c62e7b73b3f05e40fba6e58b)
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/core/Dockerfile | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index e0459ff0..ac5b963d 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.15 +FROM alpine:3.16 ARG BRANCH=stable/v1.25 ARG OPENSTACK_TAG=stable/yoga @@ -18,11 +18,6 @@ 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 /^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 && \ (cd /src/functest-kubernetes && \ git fetch --tags https://gerrit.opnfv.org/gerrit/functest-kubernetes $BRANCH && \ @@ -36,7 +31,7 @@ RUN apk -U upgrade && \ -c/src/requirements/upper-constraints.txt \ /src/functest-kubernetes && \ (cd /src/rally && patch -p1 < /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch) && \ - (cd /usr/lib/python3.9/site-packages/xrally_kubernetes/ && \ + (cd /usr/lib/python3.10/site-packages/xrally_kubernetes/ && \ patch -p2 < /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch) && \ rm -rf /src/functest-kubernetes /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch && \ bash -c "mkdir -p /var/lib/xtesting /home/opnfv" && \ |