From 8bd4e0484cf77943363acd981be99a53d5e2cb1e Mon Sep 17 00:00:00 2001 From: Christian Decker Date: Fri, 16 Feb 2024 15:08:17 +0100 Subject: [PATCH] release: Unbreak the Fedora build We have installation instructions that tell the user to use `poetry` and then we ourselves think we're clever and install only a known subset? It was only a matter of time until we broke this. Changelog-None --- contrib/docker/Dockerfile.builder.fedora | 9 ++++++--- tools/build-release.sh | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/contrib/docker/Dockerfile.builder.fedora b/contrib/docker/Dockerfile.builder.fedora index 3cb6b9c7a972..22cb8c22bf67 100644 --- a/contrib/docker/Dockerfile.builder.fedora +++ b/contrib/docker/Dockerfile.builder.fedora @@ -12,7 +12,8 @@ RUN dnf update -y && \ libsq3-devel \ python3-devel \ python3-mako \ - python3-pip \ + python3-pip \ + python3-virtualenv \ python3-setuptools \ redhat-lsb \ net-tools \ @@ -30,5 +31,7 @@ RUN wget https://bitcoin.org/bin/bitcoin-core-$BITCOIN_VERSION/bitcoin-$BITCOIN_ mv bitcoin-$BITCOIN_VERSION/share/man/man1/* /usr/share/man/man1 && \ rm -rf bitcoin.tar.gz bitcoin-$BITCOIN_VERSION -RUN python3 -m pip install --force-reinstall -U pip setuptools && \ - python3 -m pip install python-bitcoinlib pytest pytest-test-groups flake8 pytest-rerunfailures ephemeral-port-reserve +ENV PATH=/opt/venv/bin:${PATH} +RUN python3 -m pip install pip wheel && \ + python3 -m virtualenv /opt/venv && \ + /opt/venv/bin/python3 -m pip install --force-reinstall -U pip poetry wheel diff --git a/tools/build-release.sh b/tools/build-release.sh index 81dc210d16e3..924ac7af1c70 100755 --- a/tools/build-release.sh +++ b/tools/build-release.sh @@ -8,7 +8,8 @@ if [ "$1" = "--inside-docker" ]; then PLTFM="$3" git clone /src /build cd /build - pip3 install -r plugins/clnrest/requirements.txt + poetry export --without-hashes > /tmp/requirements.txt + python3 -m pip install -r /tmp/requirements.txt ./configure make VERSION="$VER" make install DESTDIR=/"$VER-$PLTFM" RUST_PROFILE=release