From ae9add8366802b690b1d7ffea2e6f4b3ae789ba2 Mon Sep 17 00:00:00 2001
From: Longbiao CHEN <longbiaochen@me.com>
Date: Thu, 14 May 2026 23:53:56 +0800
Subject: [PATCH 1/2] docker: make local builds work without version arg

---
 Dockerfile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 970537394ff0..a934863f9161 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -124,7 +124,8 @@ ARG LD=${target_arch}-ld
 ARG STRIP=${target_arch}-strip
 ARG TARGET=${target_arch_rust}
 ARG RUST_PROFILE=release
-ARG VERSION
+ARG VERSION=master
+ARG MAKE_JOBS
 ENV VERSION=${VERSION}
 
 #TODO: set all the following cargo config options via env variables (https://doc.rust-lang.org/cargo/reference/environment-variables.html)
@@ -155,7 +156,7 @@ COPY .git/ .git/
 RUN git submodule update --init --recursive --jobs $(nproc) --depth 1
 
 RUN ./configure --prefix=/tmp/lightning_install --enable-static --disable-compat --disable-valgrind
-RUN uv run make install-program -j$(nproc)
+RUN uv run make install-program -j${MAKE_JOBS:-$(nproc)}
 
 RUN find /tmp/lightning_install -type f -executable -exec \
     file {} + | \
@@ -284,4 +285,4 @@ VOLUME ["/root/.lightning"]
 ENTRYPOINT ["/entrypoint.sh"]
 
 # Default target (for backward compatibility)
-FROM lightningd AS final
\ No newline at end of file
+FROM lightningd AS final

From 4d8282d392d9c610ab95dcdcfa6ca92a5db3959c Mon Sep 17 00:00:00 2001
From: Longbiao CHEN <longbiaochen@me.com>
Date: Fri, 15 May 2026 00:56:13 +0800
Subject: [PATCH 2/2] Preserve derived Docker build versions

---
 Dockerfile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a934863f9161..fd180c9bb20d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -124,9 +124,8 @@ ARG LD=${target_arch}-ld
 ARG STRIP=${target_arch}-strip
 ARG TARGET=${target_arch_rust}
 ARG RUST_PROFILE=release
-ARG VERSION=master
+ARG VERSION
 ARG MAKE_JOBS
-ENV VERSION=${VERSION}
 
 #TODO: set all the following cargo config options via env variables (https://doc.rust-lang.org/cargo/reference/environment-variables.html)
 RUN mkdir -p .cargo && tee .cargo/config.toml <<EOF
@@ -156,7 +155,11 @@ COPY .git/ .git/
 RUN git submodule update --init --recursive --jobs $(nproc) --depth 1
 
 RUN ./configure --prefix=/tmp/lightning_install --enable-static --disable-compat --disable-valgrind
-RUN uv run make install-program -j${MAKE_JOBS:-$(nproc)}
+RUN if [ -n "${VERSION:-}" ]; then \
+        VERSION="${VERSION}" uv run make install-program -j"${MAKE_JOBS:-$(nproc)}"; \
+    else \
+        uv run make install-program -j"${MAKE_JOBS:-$(nproc)}"; \
+    fi
 
 RUN find /tmp/lightning_install -type f -executable -exec \
     file {} + | \