diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2024-04-18 14:57:39 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2024-04-18 14:57:39 +0200 |
| commit | 66f8394c745bd7a3951699134e0ee8d4369f6d6b (patch) | |
| tree | a1661fcd5a0fd0ab7a28c4fd3123c13d6d49b87d /docker/core/Dockerfile | |
| parent | 345d7a172c8f5556e58f645bb03eec436e86d999 (diff) | |
Take latest Rally K8S patch into account
Functest's patch was merged upstream.
Change-Id: I04a401e99ea5ce6995e3d7648c1452d307bcf78d
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/core/Dockerfile')
| -rw-r--r-- | docker/core/Dockerfile | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index e935d426..b6507da1 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -6,7 +6,6 @@ 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 -COPY Enforce-baseline-Pod-Security-Standard-with-namespac.patch /tmp/Enforce-baseline-Pod-Security-Standard-with-namespac.patch RUN apk -U upgrade && \ apk --no-cache add --update python3 py3-pip py3-wheel bash git grep libffi openssl mailcap \ libxml2 libxslt gcompat && \ @@ -36,16 +35,14 @@ RUN apk -U upgrade && \ /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/ && \ - patch -p2 < /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch && \ - patch -p2 < /tmp/Enforce-baseline-Pod-Security-Standard-with-namespac.patch) && \ + 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" && \ ln -s /var/lib/xtesting /home/opnfv/functest && \ mkdir -p /etc/rally && \ 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 \ - /tmp/Enforce-baseline-Pod-Security-Standard-with-namespac.patch && \ + 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 && \ |