From 1b69dae1a9df060f086af9a700a91524071cbf08 Mon Sep 17 00:00:00 2001
From: w3irdrobot <3712883+w3irdrobot@users.noreply.github.com>
Date: Thu, 30 Jun 2022 13:13:09 -0400
Subject: [PATCH] Update Dockerfile

---
 Dockerfile | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d3a2714..9b3b413 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,6 @@
-FROM elementsproject/lightningd
+ARG CLN_VERSION="0.11.1"
+
+FROM elementsproject/lightningd:v${CLN_VERSION}
 
 ARG EXTRA_PLUGINS='--recurse-submodules=csvexportpays \
 --recurse-submodules=graphql \
@@ -7,17 +9,29 @@ ARG EXTRA_PLUGINS='--recurse-submodules=csvexportpays \
 --recurse-submodules=trustedcoin \
 --recurse-submodules=webhook'
 
-RUN apt-get update && apt-get install -y --no-install-recommends build-essential python3-wheel python3-dev python3-venv libleveldb-dev pkg-config libc-bin git libpq-dev postgresql
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    build-essential \
+    python3-wheel \
+    python3-dev \
+    python3-venv \
+    libleveldb-dev \
+    pkg-config \
+    libc-bin \
+    git \
+    libpq-dev \
+    postgresql \
+    curl && \
+    python3 -m pip install --upgrade pip
 
 COPY . /tmp/plugins
-RUN mkdir /tmp/oldplugins && mv /opt/lightningd/plugins/* /tmp/oldplugins/ && \
-    cd /opt/lightningd/plugins && \
+RUN mkdir /tmp/oldplugins && mv /usr/local/libexec/c-lightning/plugins/* /tmp/oldplugins/ && \
+    cd /usr/local/libexec/c-lightning/plugins && \
     git clone --depth 1 --shallow-submodules -j4 \
         ${EXTRA_PLUGINS} \
         file:///tmp/plugins . && \
     pip3 install setuptools && \
-    find -name requirements.txt -exec pip3 install -r {} \; && \
-    mv /tmp/oldplugins/* /opt/lightningd/plugins/ && rmdir /tmp/oldplugins
+    find -name requirements.txt -print0 | xargs -0 -n 1 pip3 install -r && \
+    mv /tmp/oldplugins/* /usr/local/libexec/c-lightning/plugins && rmdir /tmp/oldplugins
 
 EXPOSE 9735 9835
 ENTRYPOINT  [ "/usr/bin/tini", "-g", "--", "./entrypoint.sh" ]