Revert latest docker builds

[functest-kubernetes.git] / docker / core / Dockerfile

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 89e54fc..24354ce 100644 (file)
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.14
+FROM alpine:3.15
 
 ARG BRANCH=master
 ARG OPENSTACK_TAG=master
@@ -7,9 +7,10 @@ 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 && \
     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 && \
@@ -35,7 +36,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.9/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" && \
@@ -45,6 +46,6 @@ RUN apk -U upgrade && \
     mkdir -p /var/lib/rally/database && rally db create && \
     rm -r /src/requirements/.git /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch && \
     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
+COPY logging.ini /etc/xtesting/logging.ini
+COPY logging.debug.ini /etc/xtesting/logging.debug.ini
 CMD ["run_tests", "-t", "all"]