From 1bf3aa8590bc89e147fcf631e5b75b63738613b0 Mon Sep 17 00:00:00 2001
From: snogcel <ledniknoj@gmail.com>
Date: Mon, 26 Nov 2018 16:36:30 -0700
Subject: [PATCH] update dash docker fragment

---
 dash-cli.ps1                                  |  2 +-
 dash-cli.sh                                   |  2 +-
 .../docker-fragments/dash.yml                 | 37 +++++++++----------
 3 files changed, 19 insertions(+), 22 deletions(-)
 mode change 100644 => 100755 dash-cli.ps1
 mode change 100644 => 100755 dash-cli.sh

diff --git a/dash-cli.ps1 b/dash-cli.ps1
old mode 100644
new mode 100755
index dcb6862..2a18267
--- a/dash-cli.ps1
+++ b/dash-cli.ps1
@@ -1 +1 @@
-docker exec -ti --user dash btcpayserver_dashd dash-cli $args
\ No newline at end of file
+docker exec -ti btcpayserver_dashd dash-cli -datadir="/home/dash/.dashcore" $args
\ No newline at end of file
diff --git a/dash-cli.sh b/dash-cli.sh
old mode 100644
new mode 100755
index fa2948f..02fe5b3
--- a/dash-cli.sh
+++ b/dash-cli.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker exec -ti --user dash btcpayserver_dashd dash-cli "$@"
+docker exec -ti btcpayserver_dashd dash-cli -datadir="/home/dash/.dashcore" "$@"
diff --git a/docker-compose-generator/docker-fragments/dash.yml b/docker-compose-generator/docker-fragments/dash.yml
index f7a9e10..37b8948 100644
--- a/docker-compose-generator/docker-fragments/dash.yml
+++ b/docker-compose-generator/docker-fragments/dash.yml
@@ -4,35 +4,32 @@ services:
   dashd:
       restart: unless-stopped
       container_name: btcpayserver_dashd
-      image: uphold/dash-core:0.12.2.3-alpine
+      image: snogcel/docker-dash-core:latest
+      environment:
+        DASH_EXTRA_ARGS: |
+          printtoconsole=1
+          rpcallowip=::/0
+          rpcport=9998
+          ${NBITCOIN_NETWORK:-regtest}=1
+          port=9999
+          whitelist=0.0.0.0/0
       expose:
-        - "43782"
-        - "39388"
-      ports:
-        - "9999:9999"
-        - "9998:9998"
-        - "19999:19999"
-        - "19998:19998"
+        - "9998"
+        - "9999"
       volumes:
         - "dash_datadir:/home/dash/.dashcore"
-      command:
-        -${NBITCOIN_NETWORK:-regtest}=1
-        -rpcport=43782
-        -port=39388
-        -whitelist=0.0.0.0/0
-        -printtoconsole
   nbxplorer:
       environment:
-        NBXPLORER_CHAINS: "DASH"
-        NBXPLORER_DASHRPCURL: http://dashd:43782/
-        NBXPLORER_DASHNODEENDPOINT: dashd:39388
+        NBXPLORER_CHAINS: "dash"
+        NBXPLORER_DASHRPCURL: http://dashd:9998/
+        NBXPLORER_DASHNODEENDPOINT: dashd:9999
       links:
         - dashd
       volumes:
-        - "dash_datadir:/root/.dash"
+        - "dash_datadir:/root/.dashcore"
   btcpayserver:
       environment:
-        BTCPAY_CHAINS: "DASH"
+        BTCPAY_CHAINS: "dash"
         BTCPAY_DASHEXPLORERURL: http://nbxplorer:32838/
 volumes:
-  dash_datadir:
\ No newline at end of file
+  dash_datadir: