Skip to content

Commit 884b9ee

Browse files
docker: Dockerfile fixes after poetry to uv migration
Changelog-None.
1 parent 6a05f24 commit 884b9ee

1 file changed

Lines changed: 4 additions & 7 deletions

File tree

Dockerfile

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,6 @@ RUN apt-get update -qq && \
9090

9191
ENV PATH="/root/.local/bin:$PATH" \
9292
PYTHON_VERSION=3
93-
RUN wget -qO- https://astral.sh/uv/install.sh | sh && \
94-
&& uv sync --all-extras --all-groups
9593

9694
RUN wget -q https://zlib.net/fossils/zlib-1.2.13.tar.gz -O zlib.tar.gz && \
9795
wget -q https://www.sqlite.org/2019/sqlite-src-3290000.zip -O sqlite.zip && \
@@ -102,7 +100,9 @@ COPY . /tmp/lightning
102100
RUN git clone --recursive /tmp/lightning . && \
103101
git checkout $(git --work-tree=/tmp/lightning --git-dir=/tmp/lightning/.git rev-parse HEAD)
104102

105-
# Do not build python plugins here, python doesn't support cross compilation.
103+
RUN wget -qO- https://astral.sh/uv/install.sh | sh && \
104+
uv sync --all-extras --all-groups
105+
106106
WORKDIR /
107107

108108
FROM base-builder AS base-builder-linux-amd64
@@ -224,8 +224,6 @@ RUN ./configure --prefix=/tmp/lightning_install --enable-static && uv run make i
224224
WORKDIR /opt/lightningd
225225
RUN echo 'RUSTUP_INSTALL_OPTS="${RUSTUP_INSTALL_OPTS}"' > /tmp/rustup_install_opts.txt
226226

227-
# Copy rustup_install_opts.txt file from builder
228-
COPY --from=builder /tmp/rustup_install_opts.txt /tmp/rustup_install_opts.txt
229227
# Setup ENV $RUSTUP_INSTALL_OPTS for this stage
230228
RUN export $(cat /tmp/rustup_install_opts.txt)
231229
ENV PATH="/root/.cargo/bin:/root/.venvs/cln/bin:$PATH"
@@ -241,7 +239,7 @@ RUN apt-get update && \
241239
socat \
242240
inotify-tools \
243241
jq \
244-
python3 \
242+
python3 && \
245243
apt-get clean && \
246244
rm -rf /var/lib/apt/lists/*
247245

@@ -262,7 +260,6 @@ RUN --mount=type=bind,from=builder,source=/var/libpq,target=/var/libpq,rw \
262260
ldconfig
263261

264262
COPY --from=builder /tmp/lightning_install/ /usr/local/
265-
COPY --from=builder-python /root/.venvs/cln/lib/python3.11/site-packages /usr/local/lib/python3.11/dist-packages/
266263
COPY --from=downloader /opt/bitcoin/bin /usr/bin
267264
COPY --from=downloader /opt/litecoin/bin /usr/bin
268265
COPY tools/docker-entrypoint.sh entrypoint.sh

0 commit comments

Comments
 (0)