diff --git a/roles/apps/templates/clightning/Containerfile.j2 b/roles/apps/templates/clightning/Containerfile.j2 index ad89344..ad34dfd 100644 --- a/roles/apps/templates/clightning/Containerfile.j2 +++ b/roles/apps/templates/clightning/Containerfile.j2 @@ -26,6 +26,8 @@ RUN gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys ${BITCOIN_CORE_SIGNAT FROM docker.io/almalinux/9-base:latest +COPY --from=builder /usr/local/ /usr/local/ + RUN dnf update -y && dnf install -y ca-certificates \ gnupg2 \ libatomic \ @@ -34,10 +36,11 @@ RUN dnf update -y && dnf install -y ca-certificates \ gzip \ shadow-utils \ python3 \ - && dnf clean all && rm -fr /tmp/* /var/tmp/* - - -COPY --from=builder /usr/local/ /usr/local/ + python3-setuptools \ + python3-pip \ + micropipenv \ + && dnf clean all && rm -fr /tmp/* /var/tmp/* \ + && cd /usr/local/libexec/c-lightning/plugins/clnrest/ && micropipenv install --method requirements COPY ./entrypoint.sh /entrypoint.sh diff --git a/roles/apps/templates/clightning/build.sh.j2 b/roles/apps/templates/clightning/build.sh.j2 index cc5c28d..65a8ffa 100644 --- a/roles/apps/templates/clightning/build.sh.j2 +++ b/roles/apps/templates/clightning/build.sh.j2 @@ -1,10 +1,9 @@ #! /bin/sh # # build.sh -# Copyright (C) 2024 barry # # Distributed under terms of the MIT license. # +buildah bud -f Containerfile -t clightning-node:{{clightning_version}} -echo 0 diff --git a/roles/apps/templates/clightning/clightning-node.container.j2 b/roles/apps/templates/clightning/clightning-node.container.j2 index 44d1de1..764018a 100644 --- a/roles/apps/templates/clightning/clightning-node.container.j2 +++ b/roles/apps/templates/clightning/clightning-node.container.j2 @@ -4,7 +4,7 @@ Description=Core Lightning Server [Container] Image={{ registry_url }}/clightning:{{ clightning_version }} PodmanArgs=--pod bitcoin-pod -Exec=--rpcuser={{bitcoin_rpcuser}} --rpcpassword={{bitcoin_rpcpassword}} +Exec=--bitcoin-rpcuser={{bitcoin_rpcuser}} --bitcoin-rpcpassword={{bitcoin_rpcpassword}} # Use volume Volume=/home/{{ansible_user}}/.bitcoin:/data/.bitcoin:ro,Z