diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2021-04-19 14:38:20 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2021-04-19 19:00:30 +0200 |
| commit | ca65524bf2331ff832a7a34cc3cf02f9b1c7070f (patch) | |
| tree | 8b6d454f14a82edbf47275c30bd19f5c6ec93fef | |
| parent | 9a804f02ff1b0eda0fa5c15454d3f2b84ca4ce77 (diff) | |
Update to Alpine 3.13
Change-Id: I178495b72ea6296e33c3ac06171d11c2ce5bf897
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -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 3181f47a1..ae3628621 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 @@ -24,12 +24,13 @@ RUN apk -U upgrade && \ git checkout FETCH_HEAD) && \ sed -i -E /^tempest==+.*$/d /src/requirements/upper-constraints.txt && \ sed -i -E /^neutron==+.*$/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 --no-cache-dir --src /src -c/src/functest/upper-constraints.txt -c/src/requirements/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 \ -e /src/requirements && \ update-requirements -s --source /src/requirements /src/functest && \ - pip3 install --no-cache-dir --src /src -c/src/functest/upper-constraints.txt -c/src/requirements/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 \ -e /src/functest && \ (cd /src/rally && patch -p1 < /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch) && \ sed -i -E /#egg=rally/d /src/functest/upper-constraints.txt && \ |