From 882505de40ea6b199824c9dccb2887a368b1df3b Mon Sep 17 00:00:00 2001
From: ShahanaFarooqui <shahana.farooqui@gmail.com>
Date: Mon, 3 Nov 2025 22:08:05 -0800
Subject: [PATCH 1/2] docker: Add lowdown and libsodium

---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index db9e2691c892..f4fc7b93b1d7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -110,6 +110,8 @@ RUN apt-get update && \
         zlib1g-dev:${target_arch_dpkg} \
         libsqlite3-dev:${target_arch_dpkg} \
         libpq-dev:${target_arch_dpkg} \
+        libsodium-dev:${target_arch_dpkg} \
+        lowdown:${target_arch_dpkg} \
         crossbuild-essential-${target_arch_dpkg}
 
 ARG AR=${target_arch}-ar

From 29275a2dfcd09111c9ed91433ca1c168f827d6e2 Mon Sep 17 00:00:00 2001
From: ShahanaFarooqui <shahana.farooqui@gmail.com>
Date: Mon, 20 Oct 2025 00:07:02 -0700
Subject: [PATCH 2/2] docker: Fix missing CLN version in docker image

Changelog-Fixed: Core lightning version in Docker image will not be missing.
---
 .dockerignore                        | 12 ++++++++----
 .github/workflows/docker-release.yml |  3 +++
 .gitignore                           |  1 +
 Dockerfile                           |  2 ++
 Makefile                             |  5 ++++-
 5 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 955f81af7237..4be4454f5ecf 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,6 +1,10 @@
-Dockerfile
-contrib/docker/Dockerfile.*
-target
 config.vars
+.cargo/
+.vscode/
+.venv/
+dist/
+target/
 release/
-.venv/
\ No newline at end of file
+focal/
+jammy/
+noble/
diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index 635c3979a933..64a64995c5aa 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -36,6 +36,7 @@ jobs:
       uses: actions/checkout@v4
       with:
         ref: ${{ github.ref }}  # Ensures the branch triggering the workflow is checked out
+        fetch-depth: 0
 
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3
@@ -116,3 +117,5 @@ jobs:
         push: true
         platforms: ${{ env.PLATFORMS }}
         tags: ${{ env.TAGS }}
+        build-args: |
+          VERSION=${{ env.VERSION }}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index d8ba3ca5c522..d90ccc953bc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -86,6 +86,7 @@ plugins/clnrest
 plugins/wss-proxy
 plugins/cln-bip353
 .clangd
+.cargo/
 
 # Build directories
 bionic/
diff --git a/Dockerfile b/Dockerfile
index f4fc7b93b1d7..c0004c574b0a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -122,6 +122,8 @@ ARG LD=${target_arch}-ld
 ARG STRIP=${target_arch}-strip
 ARG TARGET=${target_arch_rust}
 ARG RUST_PROFILE=release
+ARG VERSION
+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
diff --git a/Makefile b/Makefile
index 32e95d48327b..c1caa062b947 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,10 @@
 #! /usr/bin/make
 
+# Prefer VERSION from environment if provided (e.g., from GitHub Actions)
 # Extract version from git, or if we're from a zipfile, use dirname
-VERSION=$(shell git describe --tags --always --dirty=-modded --abbrev=7 2>/dev/null || pwd | $(SED) -n 's|.*/c\{0,1\}lightning-v\{0,1\}\([0-9a-f.rc\-]*\)$$|v\1|gp')
+VERSION ?= $(shell git describe --tags --always --dirty=-modded --abbrev=7 2>/dev/null || \
+	pwd | sed -n 's|.*/c\{0,1\}lightning-v\{0,1\}\([0-9a-f.rc\-]*\)$$|v\1|gp')
+$(info Building version $(VERSION))
 
 # Next release.
 CLN_NEXT_VERSION := v25.12