From d2b3da545546927511fa37c3d93be5d077234915 Mon Sep 17 00:00:00 2001
From: tiero <3596602+tiero@users.noreply.github.com>
Date: Fri, 10 Feb 2023 23:11:29 +0100
Subject: [PATCH] use docker container from @lncm

---
 cmd/nigiri/resources/docker-compose.yml | 12 ++++++------
 cmd/nigiri/rpc.go                       |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cmd/nigiri/resources/docker-compose.yml b/cmd/nigiri/resources/docker-compose.yml
index addcac4..f5495af 100644
--- a/cmd/nigiri/resources/docker-compose.yml
+++ b/cmd/nigiri/resources/docker-compose.yml
@@ -3,11 +3,12 @@ services:
 
   # RPC daemon
   bitcoin:
-    image: ghcr.io/vulpemventures/bitcoin:latest
-    user: 1000:1000
+    image: lncm/bitcoind:v24.0.1
     container_name: bitcoin
-    command:
-      - -datadir=config
+    # wildcard user 0:0 to avoid permission problems
+    user: 0:0
+    restart: on-failure
+    stop_grace_period: 30s
     ports:
       - 18443:18443
       - 18444:18444
@@ -15,8 +16,7 @@ services:
       - 28332:28332
       - 28333:28333
     volumes:
-      - ./volumes/bitcoin/:/config
-    restart: unless-stopped
+      - ./volumes/bitcoin:/root/.bitcoin
 
   liquid:
     image: ghcr.io/vulpemventures/elements:latest
diff --git a/cmd/nigiri/rpc.go b/cmd/nigiri/rpc.go
index f97acf6..d9057ff 100644
--- a/cmd/nigiri/rpc.go
+++ b/cmd/nigiri/rpc.go
@@ -48,7 +48,7 @@ func rpcAction(ctx *cli.Context) error {
 	generate := ctx.Int("generate")
 	named := ctx.Bool("named")
 
-	rpcArgs := []string{"exec", "bitcoin", "bitcoin-cli", "-datadir=config", "-rpcwallet=" + rpcWallet}
+	rpcArgs := []string{"exec", "bitcoin", "bitcoin-cli", "-rpcwallet=" + rpcWallet}
 	if isLiquid {
 		rpcArgs = []string{"exec", "liquid", "elements-cli", "-datadir=config", "-rpcwallet=" + rpcWallet}
 	}