diff options
Diffstat (limited to 'docker/core/Dockerfile')
-rw-r--r-- | docker/core/Dockerfile | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 29723c709..2715cce39 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,10 +1,9 @@ -FROM alpine:3.14 +FROM alpine:3.16 ARG BRANCH=master ARG OPENSTACK_TAG=master COPY Switch-to-threading.Thread-for-Rally-tasks.patch /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch -COPY Create-new-server-in-test_create_backup.patch /tmp/Create-new-server-in-test_create_backup.patch RUN apk -U upgrade && \ apk --no-cache add --update \ python3 py3-wheel libffi openssl libjpeg-turbo py3-pip bash \ @@ -14,8 +13,6 @@ RUN apk -U upgrade && \ python3-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev rust cargo \ libxml2-dev libxslt-dev && \ - apk --no-cache add --update py3-distlib\>=0.3.1 \ - --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main && \ git init /src/requirements && \ (cd /src/requirements && \ git fetch --tags https://review.opendev.org/openstack/requirements $OPENSTACK_TAG && \ @@ -25,9 +22,7 @@ RUN apk -U upgrade && \ git fetch --tags https://gerrit.opnfv.org/gerrit/functest $BRANCH && \ git checkout FETCH_HEAD) && \ sed -i -E /^tempest==+.*$/d /src/requirements/upper-constraints.txt && \ - 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 && \ + 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 --use-deprecated=legacy-resolver --no-cache-dir --src /src -c/src/functest/upper-constraints.txt -c/src/requirements/upper-constraints.txt \ @@ -38,20 +33,15 @@ RUN apk -U upgrade && \ (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 && \ sed -i -E /#egg=tempest/d /src/functest/upper-constraints.txt && \ - (cd /src/tempest && \ - git config --global user.email "opnfv-tech-discuss@lists.opnfv.org" && \ - git config --global user.name "Functest" && \ - patch -p1 < /tmp/Create-new-server-in-test_create_backup.patch && \ - git commit -a -m "Backport critical bugfixes" && \ - rm ~/.gitconfig) && \ rm -r /src/requirements/.git /src/functest/.git \ - /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch \ - /tmp/Create-new-server-in-test_create_backup.patch && \ + /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch && \ + mkdir -p /etc/xtesting && \ cp /src/functest/functest/ci/logging.ini /etc/xtesting/ && \ cp /src/functest/functest/ci/logging.debug.ini /etc/xtesting/ && \ - bash -c "mkdir -p /var/lib/xtesting /home/opnfv" && \ + sh -c "mkdir -p /var/lib/xtesting /home/opnfv" && \ ln -s /var/lib/xtesting /home/opnfv/functest && \ - bash -c "mkdir -p /home/opnfv/functest{/conf,/data,/images,/results} /home/opnfv/repos/vnfs" && \ + sh -c "mkdir -p /home/opnfv/functest/conf /home/opnfv/functest/conf/data /home/opnfv/functest/conf/images /home/opnfv/functest/conf/results && \ + mkdir -p /home/opnfv/repos/vnfs" && \ mkdir -p /etc/rally && \ printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'\n" > /etc/rally/rally.conf && \ printf "\n[openstack]\nneutron_bind_l2_agent_types = Open vSwitch agent,Linux bridge agent,OVN Controller Gateway agent\n" >> /etc/rally/rally.conf && \ |