Skip to content

Commit bea4908

Browse files
authored
Merge pull request #176 from pehala/dockerfile_cfssl
Dockefile updates
2 parents 8c68e03 + 7bc44bb commit bea4908

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

Dockerfile

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
1-
FROM quay.io/centos/centos:stream
1+
FROM quay.io/centos/centos:stream9
22
LABEL description="Run Kuadrant integration tests \
33
Default ENTRYPOINT: 'make' and CMD: 'test' \
44
Bind dynaconf settings to /opt/secrets.yaml \
55
Bind kubeconfig to /opt/kubeconfig \
66
Bind a dir to /test-run-results to get reports "
77

8-
RUN useradd --no-log-init -u 1001 -r -U -m testsuite
9-
RUN dnf install -y python3.9 make git && dnf clean all
8+
RUN useradd --no-log-init -u 1001 -g root -m testsuite
9+
RUN dnf install -y python3 pip make git && dnf clean all
1010

1111
RUN curl https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable/openshift-client-linux.tar.gz >/tmp/oc.tgz && \
1212
tar xzf /tmp/oc.tgz -C /usr/local/bin && \
1313
rm /tmp/oc.tgz
1414

15+
RUN curl -L https://github.com/cloudflare/cfssl/releases/download/v1.6.3/cfssl_1.6.3_linux_amd64 >/usr/bin/cfssl && \
16+
chmod +x /usr/bin/cfssl
17+
1518
RUN python3 -m pip --no-cache-dir install pipenv
1619

1720
WORKDIR /opt/workdir/kuadrant-testsuite
@@ -21,7 +24,7 @@ COPY . .
2124
RUN mkdir -m 0700 /test-run-results && chown testsuite /test-run-results && \
2225
chown testsuite -R /opt/workdir/*
2326

24-
USER 1001
27+
USER testsuite
2528

2629

2730
ENV KUBECONFIG=/run/kubeconfig \

testsuite/resources/performance/__init__.py

Whitespace-only changes.

testsuite/resources/performance/files/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)