aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2024-09-09 10:30:15 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2024-09-09 10:31:17 +0200
commitc4de3877ca0ff53820fb8019f1cea067969f16ad (patch)
tree888ad6f904b932a61ceef51ec9a2b03ae9913451 /docker
parent66f8394c745bd7a3951699134e0ee8d4369f6d6b (diff)
Update to Alpine 3.20
Please note functest kubernetes now hosts its upper-constraints.txt. Change-Id: I87a4fa5e5437841d7f708d3ed9cc332d3b676cfb Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker')
-rw-r--r--docker/core/Dockerfile13
1 files changed, 6 insertions, 7 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index b6507da1..8ebd2c51 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,8 +1,7 @@
-FROM alpine:3.16
+FROM alpine:3.20
ARG BRANCH=master
ARG OPENSTACK_TAG=master
-ARG OPNFV_TAG=master
COPY Try-a-quick-fix-vs-asynchronuous-issues.patch /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch
COPY Switch-to-threading.Thread-for-Rally-tasks.patch /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch
@@ -25,16 +24,16 @@ RUN apk -U upgrade && \
(cd /src/functest-kubernetes && \
git fetch --tags https://gerrit.opnfv.org/gerrit/functest-kubernetes $BRANCH && \
git checkout FETCH_HEAD) && \
- pip3 install --use-deprecated=legacy-resolver --no-cache-dir --src /src \
- -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$OPNFV_TAG \
+ pip3 install --break-system-packages --use-deprecated=legacy-resolver --no-cache-dir --src /src \
+ -c/src/functest-kubernetes/upper-constraints.txt \
-c/src/requirements/upper-constraints.txt \
setuptools_scm && \
- pip3 install --use-deprecated=legacy-resolver --no-cache-dir --src /src \
- -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$OPNFV_TAG \
+ pip3 install --break-system-packages --use-deprecated=legacy-resolver --no-cache-dir --src /src \
+ -c/src/functest-kubernetes/upper-constraints.txt \
-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.10/site-packages/xrally_kubernetes/ && \
+ (cd /usr/lib/python3.12/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" && \