X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fcore%2FDockerfile;h=83aecb375267ec51b755952d7eb4ba0a22afe32f;hb=41ca9d7f98eead4bcdcf36211130c84b11e78f47;hp=89e54fc950372dad18254dec95637522a15ad13d;hpb=8b86dd02328e331cc01b21bf1072e515bbd6db68;p=functest-kubernetes.git

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 89e54fc9..83aecb37 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
@@ -7,21 +7,20 @@ 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
 RUN apk -U upgrade && \
-    apk --no-cache add --update python3 py3-pip py3-wheel bash git grep libffi openssl mailcap && \
+    apk --no-cache add --update python3 py3-pip py3-wheel bash git grep libffi openssl mailcap \
+        libxml2 libxslt gcompat && \
+    ln -sf /lib/libgcompat.so.0 /lib/libresolv.so.2 && \
     apk --no-cache add --virtual .build-deps --update \
-        python3-dev build-base libffi-dev openssl-dev rust cargo && \
+        python3-dev build-base libffi-dev openssl-dev rust cargo libxml2-dev libxslt-dev && \
     git init /src/requirements && \
     (cd /src/requirements && \
         git fetch --tags https://review.opendev.org/openstack/requirements $OPENSTACK_TAG && \
         git checkout FETCH_HEAD) && \
+    sed -i -E /^packaging==+.*$/d /src/requirements/upper-constraints.txt && \
+    sed -i -E /^PyYAML==+.*$/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 /^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 && \
@@ -35,7 +34,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.8/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" && \
@@ -44,7 +43,11 @@ RUN apk -U upgrade && \
     printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \
     mkdir -p /var/lib/rally/database && rally db create && \
     rm -r /src/requirements/.git /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch && \
+    addgroup -g 1000 xtesting && adduser -u 1000 -G xtesting -D xtesting && \
+    mkdir -p /etc/xtesting && chown -R xtesting: /etc/xtesting /etc/rally && \
+    mkdir -p /var/lib/xtesting/results && chown -R xtesting: /var/lib/xtesting /var/lib/rally && \
     apk del .build-deps
-COPY logging.ini /usr/lib/python3.9/site-packages/xtesting/ci/logging.ini
-COPY logging.debug.ini /usr/lib/python3.9/site-packages/xtesting/ci/logging.debug.ini
+USER xtesting
+COPY logging.ini /etc/xtesting/logging.ini
+COPY logging.debug.ini /etc/xtesting/logging.debug.ini
 CMD ["run_tests", "-t", "all"]