Skip to content

Commit 317ca3a

Browse files
committed
Update base image to ubuntu 24
1 parent 6339b9c commit 317ca3a

1 file changed

Lines changed: 4 additions & 6 deletions

File tree

contrib/Dockerfile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
# Docker image used for running tests the under all the supported Python
1717
# versions
18-
FROM ubuntu:22.04
18+
FROM ubuntu:24.04
1919

2020
ARG DEBIAN_FRONTEND=noninteractive
2121

@@ -42,9 +42,6 @@ RUN set -e && \
4242
pypy3 \
4343
pypy3-dev \
4444
python3-pip \
45-
python3-distutils \
46-
python3.10-distutils \
47-
python3.12-distutils \
4845
libvirt-dev \
4946
# Needed by libvirt driver
5047
pkg-config
@@ -55,9 +52,10 @@ COPY . /libcloud
5552
RUN if [ ! -f "/libcloud/README.rst" ]; then echo "libcloud/README.rst file not found, you are likely not running docker build from the repository root directory"; exit 1; fi
5653

5754
WORKDIR /libcloud
55+
ENV PATH="/libcloud/.venv/bin:${PATH}"
5856

5957
RUN set -e && \
60-
python3.12 -m pip install uv && \
61-
python3.12 -m uv pip install --no-cache-dir --group ci "."
58+
python3.12 -m pip install --break-system-packages uv && \
59+
python3.12 -m uv sync --group ci --no-dev
6260

6361
CMD ["tox", "-e", "lint,isort-check,black-check,bandit,py3.12,py3.10,py3.11,py3.13,pypypy3.10"]

0 commit comments

Comments
 (0)