Skip to content

Commit

Permalink
Merge pull request #275 from pehala/fix_dockerfile
Browse files Browse the repository at this point in the history
Fix missing setuptools
  • Loading branch information
pehala authored Nov 13, 2023
2 parents 87bb76c + cb67801 commit 2904571
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
6 changes: 6 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
.make-poetry-sync
.make-poetry-sync-no-dev
.github
.mypy_cache
.pytest_cache
.poetry.lock
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Bind kubeconfig to /opt/kubeconfig \
Bind a dir to /test-run-results to get reports "

RUN useradd --no-log-init -u 1001 -g root -m testsuite
RUN dnf install -y python311 pip make git && dnf clean all
RUN dnf install -y python3.11 python3.11-pip make git && dnf clean all

RUN curl https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable/openshift-client-linux.tar.gz >/tmp/oc.tgz && \
tar xzf /tmp/oc.tgz -C /usr/local/bin && \
Expand All @@ -15,7 +15,7 @@ RUN curl https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable/opensh
RUN curl -L https://github.com/cloudflare/cfssl/releases/download/v1.6.3/cfssl_1.6.3_linux_amd64 >/usr/bin/cfssl && \
chmod +x /usr/bin/cfssl

RUN python3 -m pip --no-cache-dir install poetry
RUN python3.11 -m pip --no-cache-dir install poetry

WORKDIR /opt/workdir/kuadrant-testsuite

Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ readme = "README.md"

[tool.poetry.group.main.dependencies]
python = "^3.11"
setuptools = "*" # workaround: python-keycloak depends on it
typing_extensions = "*"
pytest-xdist = "*"
pytest = "*"
Expand Down

0 comments on commit 2904571

Please sign in to comment.