mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-18 13:25:43 +01:00
Code Issues Projects Releases Wiki Activity

chore(docker): Update support for Poetry v2.0.0.

Browse Source 
- Install `poetry-plugin-export` as a separate step.
- Remove `--no-update` option from `poetry lock` as it's now default behavior.
- Add `poetry lock` to the command chain after removing cln-rest and wss-proxy.

https://github.com/python-poetry/poetry/releases/tag/2.0.0
This commit is contained in:
Se7enZ 2025-01-10 13:19:08 +01:00 committed by ShahanaFarooqui
parent 8a0771d081
commit 72df375503
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Dockerfile
View File

@ -91,7 +91,8 @@ RUN apt-get update -qq && \
ENV PATH="/root/.local/bin:$PATH" \ ENV PATH="/root/.local/bin:$PATH" \
PYTHON_VERSION=3 PYTHON_VERSION=3
RUN curl -sSL https://install.python-poetry.org | python3 - RUN curl -sSL https://install.python-poetry.org | python3 - && \
poetry self add poetry-plugin-export
RUN mkdir -p /root/.venvs && \ RUN mkdir -p /root/.venvs && \
python3 -m venv /root/.venvs/cln && \ python3 -m venv /root/.venvs/cln && \
. /root/.venvs/cln/bin/activate && \ . /root/.venvs/cln/bin/activate && \
@ -107,7 +108,9 @@ RUN git clone --recursive /tmp/lightning . && \
git checkout $(git --work-tree=/tmp/lightning --git-dir=/tmp/lightning/.git rev-parse HEAD) git checkout $(git --work-tree=/tmp/lightning --git-dir=/tmp/lightning/.git rev-parse HEAD)
# Do not build python plugins (clnrest & wss-proxy) here, python doesn't support cross compilation. # Do not build python plugins (clnrest & wss-proxy) here, python doesn't support cross compilation.
RUN sed -i '/^clnrest\|^wss-proxy/d' pyproject.toml && poetry export -o requirements.txt --without-hashes RUN sed -i '/^clnrest\|^wss-proxy/d' pyproject.toml && \
poetry lock && \
poetry export -o requirements.txt --without-hashes
RUN mkdir -p /root/.venvs && \ RUN mkdir -p /root/.venvs && \
python3 -m venv /root/.venvs/cln && \ python3 -m venv /root/.venvs/cln && \
. /root/.venvs/cln/bin/activate && \ . /root/.venvs/cln/bin/activate && \
@ -228,8 +231,8 @@ RUN ( ! [ "${target_host}" = "arm-linux-gnueabihf" ] ) || \
# Ensure that the desired grpcio-tools & protobuf versions are installed # Ensure that the desired grpcio-tools & protobuf versions are installed
# https://github.com/ElementsProject/lightning/pull/7376#issuecomment-2161102381 # https://github.com/ElementsProject/lightning/pull/7376#issuecomment-2161102381
RUN poetry lock --no-update && poetry install RUN poetry lock && poetry install && \
RUN poetry self add poetry-plugin-export poetry self add poetry-plugin-export
# Ensure that git differences are removed before making bineries, to avoid `-modded` suffix # Ensure that git differences are removed before making bineries, to avoid `-modded` suffix
# poetry.lock changed due to pyln-client, pyln-proto and pyln-testing version updates # poetry.lock changed due to pyln-client, pyln-proto and pyln-testing version updates