From 162ed573a22838e0d78b6b74f9f63b95d961d3f6 Mon Sep 17 00:00:00 2001
From: Tom Kirkpatrick <tom@strike.me>
Date: Thu, 6 Jun 2024 08:52:45 +0200
Subject: [PATCH] Apply CLN fixes

---
 docker/lndk/Dockerfile | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docker/lndk/Dockerfile b/docker/lndk/Dockerfile
index 77f1813..02864d7 100644
--- a/docker/lndk/Dockerfile
+++ b/docker/lndk/Dockerfile
@@ -19,6 +19,17 @@ WORKDIR /usr/src
 # Grab and install the latest version of lndk
 RUN git clone https://github.com/lndk-org/lndk.git . \
     && git reset --hard ${LNDK_REF} \
+    # Setup git user to ensure we can cherry-pick
+    && git config --global user.email "tom@strike.me" \
+    && git config --global user.name "Tom Kirkpatrick" \
+    # Add the orbitalturtle remote
+    && git remote add orbitalturtle https://github.com/orbitalturtle/lndk.git \
+    && git fetch --all \
+    # https://github.com/lndk-org/lndk/pull/115
+    && git cherry-pick d84344b27a022bc97b658222e185556d7a71d563 \
+        af227ee2d66710aa4e4b3f4f1c31b6d79fa88271 \
+        4a367e92321a07ae62712ed651430e55075740cc \
+        c7244b153aee227166d1bb4236597cc49caad267 \
     && cargo build --release
 
 # Copy the compiled binaries to /bin/