From 52ac01db2586eb6566531e40fc31f9764ee44a28 Mon Sep 17 00:00:00 2001 From: Alex Myers Date: Thu, 1 May 2025 12:31:49 -0500 Subject: [PATCH] Dockerfile: lock poetry installation to v2.0.1 This avoids the docker image builders breaking with: ERROR [linux/amd64 builder 15/17] RUN poetry export -o requirements.txt --without-hashes 0.780 pyproject.toml changed significantly since poetry.lock was last generated. Run Resolving dependencies... to fix the lock file. This occurred when the default installation version changed underneath us. Changelog-None --- Dockerfile | 3 ++- contrib/reprobuild/Dockerfile.focal | 2 +- contrib/reprobuild/Dockerfile.jammy | 2 +- contrib/reprobuild/Dockerfile.noble | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9aa138dd6..dba101ebf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -90,7 +90,8 @@ RUN apt-get update -qq && \ tclsh ENV PATH="/root/.local/bin:$PATH" \ - PYTHON_VERSION=3 + PYTHON_VERSION=3 \ + POETRY_VERSION=2.0.1 RUN curl -sSL https://install.python-poetry.org | python3 - && \ poetry self add poetry-plugin-export RUN mkdir -p /root/.venvs && \ diff --git a/contrib/reprobuild/Dockerfile.focal b/contrib/reprobuild/Dockerfile.focal index 49c83f693..4ff01bb5a 100644 --- a/contrib/reprobuild/Dockerfile.focal +++ b/contrib/reprobuild/Dockerfile.focal @@ -49,7 +49,7 @@ RUN git clone https://github.com/pyenv/pyenv.git /root/.pyenv && \ RUN wget https://bootstrap.pypa.io/get-pip.py -O /tmp/get-pip.py && python3 /tmp/get-pip.py \ && rm /tmp/get-pip.py \ - && pip install poetry mako grpcio-tools==1.62.2 && \ + && pip install poetry==2.0.1 mako grpcio-tools==1.62.2 && \ poetry self add poetry-plugin-export RUN wget https://sh.rustup.rs -O rustup-install.sh && \ diff --git a/contrib/reprobuild/Dockerfile.jammy b/contrib/reprobuild/Dockerfile.jammy index db96c661d..b0855c310 100644 --- a/contrib/reprobuild/Dockerfile.jammy +++ b/contrib/reprobuild/Dockerfile.jammy @@ -47,7 +47,7 @@ RUN git clone https://github.com/pyenv/pyenv.git /root/.pyenv && \ RUN wget https://bootstrap.pypa.io/get-pip.py -O /tmp/get-pip.py && python3 /tmp/get-pip.py \ && rm /tmp/get-pip.py \ - && pip install poetry mako grpcio-tools && \ + && pip install poetry==2.0.1 mako grpcio-tools && \ poetry self add poetry-plugin-export RUN wget https://sh.rustup.rs -O rustup-install.sh && \ diff --git a/contrib/reprobuild/Dockerfile.noble b/contrib/reprobuild/Dockerfile.noble index f24c6f7db..a9e410dd8 100644 --- a/contrib/reprobuild/Dockerfile.noble +++ b/contrib/reprobuild/Dockerfile.noble @@ -45,7 +45,7 @@ RUN git clone https://github.com/pyenv/pyenv.git /root/.pyenv && \ RUN wget https://bootstrap.pypa.io/get-pip.py -O /tmp/get-pip.py && python3 /tmp/get-pip.py \ && rm /tmp/get-pip.py \ - && pip install poetry mako grpcio-tools && \ + && pip install poetry==2.0.1 mako grpcio-tools && \ poetry self add poetry-plugin-export RUN wget https://sh.rustup.rs -O rustup-install.sh && \