diff --git a/.github/workflows/pifpaf.yaml b/.github/workflows/pifpaf.yaml index 1621465..e02b8c2 100644 --- a/.github/workflows/pifpaf.yaml +++ b/.github/workflows/pifpaf.yaml @@ -15,7 +15,9 @@ jobs: strategy: matrix: env: - - py310 + - py39 + - py311 + - py312 - pep8 - build steps: diff --git a/Dockerfile b/Dockerfile index 853198b..ed16cfd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 +FROM ubuntu:24.04 ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Etc/UTC @@ -11,7 +11,7 @@ RUN apt-get update -y && apt-get install -qy gnupg software-properties-common RUN add-apt-repository -y ppa:deadsnakes/ppa RUN apt-get -qq update -y \ && apt-get install -y mysql-server redis-server zookeeper nodejs npm ceph librados-dev \ - python3 python3-dev python3-pip python3.9 python3.9-dev \ + python3 python3-dev python3-pip python3-virtualenv python3.9 python3.9-dev python3.11 python3.11-dev \ gcc liberasurecode-dev liberasurecode1 postgresql libpq-dev python3-rados git wget memcached \ && rm -rf /var/lib/apt/lists/* @@ -30,7 +30,9 @@ RUN wget https://github.com/etcd-io/etcd/releases/download/v${ETCD_VERSION}/etcd && ln -s /opt/etcd-v${ETCD_VERSION}-linux-amd64/etcd /usr/local/bin/etcd \ && ln -s /opt/etcd-v${ETCD_VERSION}-linux-amd64/etcdctl /usr/local/bin/etcdctl -RUN pip install -U tox +RUN python3 -m virtualenv /tmp/pifpaf-venv +ENV PATH="/tmp/pifpaf-venv/bin:$PATH" +RUN pip install tox RUN useradd -ms /bin/bash pifpaf USER pifpaf