File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 22# Build and test environment for CI
33# =================================
44
5- FROM ubuntu:22.10 as cpp-docker-common
5+ FROM ubuntu:23.04 as cpp-docker-common
66
77ARG DEBIAN_FRONTEND=noninteractive
88ARG CLANG_COMPILER_VERSION=15
@@ -20,8 +20,11 @@ RUN apt-get update && apt-get -y dist-upgrade && apt-get -y install --fix-missin
2020 git \
2121 lsb-release \
2222 ninja-build \
23+ pipx \
2324 python3 \
2425 python3-pip \
26+ python3-setuptools \
27+ python3-venv \
2528 shellcheck \
2629 ssh \
2730 software-properties-common \
@@ -79,7 +82,7 @@ WORKDIR /home/${DEV_USER}
7982RUN sed -i 's/\\ h/docker/;s/01;32m/01;33m/' /home/${DEV_USER}/.bashrc \
8083 && mkdir /home/${DEV_USER}/git
8184
82- RUN pip install --user conan
85+ RUN pipx install conan
8386
8487
8588FROM cpp-docker-common as cpp-docker-ci
@@ -96,5 +99,5 @@ RUN groupadd -g 1000 ${CI_USER} && \
9699
97100COPY ccache.conf /etc/.
98101USER ${CI_USER}
99- RUN pip install conan
102+ RUN pipx install conan
100103WORKDIR /home/${CI_USER}
You can’t perform that action at this time.
0 commit comments