From 6f1361793cb92f858e05632cbab32d1349f6568c Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Thu, 13 Sep 2018 14:11:12 +0200 Subject: [PATCH 01/14] add dash docker --- .../docker-fragments/dash.yml | 32 +++++++++++++++++++ .../src/CryptoDefinition.cs | 5 +++ 2 files changed, 37 insertions(+) create mode 100644 docker-compose-generator/docker-fragments/dash.yml diff --git a/docker-compose-generator/docker-fragments/dash.yml b/docker-compose-generator/docker-fragments/dash.yml new file mode 100644 index 0000000..066c892 --- /dev/null +++ b/docker-compose-generator/docker-fragments/dash.yml @@ -0,0 +1,32 @@ +version: "3" + +services: + dashd: + restart: unless-stopped + container_name: btcpayserver_dashd + image: uphold/docker-dash-core:0.12.2.3 + expose: + - "43782" + - "39388" + volumes: + - "dash_datadir:/home/dash/.dashcore" + command: + -${NBITCOIN_NETWORK:-regtest}=1 + -rpcport=43782 + -port=39388 + -whitelist=0.0.0.0/0 + nbxplorer: + environment: + NBXPLORER_CHAINS: "DASH" + NBXPLORER_DASHRPCURL: http://dashd:43782/ + NBXPLORER_DASHNODEENDPOINT: dashd:39388 + links: + - dashd + volumes: + - "dash_datadir:/root/.dash" + btcpayserver: + environment: + BTCPAY_CHAINS: "DASH" + BTCPAY_DASHEXPLORERURL: http://nbxplorer:32838/ +volumes: + dash_datadir: \ No newline at end of file diff --git a/docker-compose-generator/src/CryptoDefinition.cs b/docker-compose-generator/src/CryptoDefinition.cs index 27c638e..444d282 100644 --- a/docker-compose-generator/src/CryptoDefinition.cs +++ b/docker-compose-generator/src/CryptoDefinition.cs @@ -65,6 +65,11 @@ namespace DockerGenerator { Crypto = "via", CryptoFragment = "viacoin" + }, + new CryptoDefinition() + { + Crypto = "DASH", + CryptoFragment = "dash" } }; } From 9374dad373119fd62d47d42afe8979babe0007c3 Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Mon, 17 Sep 2018 10:20:49 +0200 Subject: [PATCH 02/14] allow to specify generator image when building --- build.ps1 | 3 ++- build.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.ps1 b/build.ps1 index 840d9a4..89ed908 100755 --- a/build.ps1 +++ b/build.ps1 @@ -1,6 +1,7 @@ # This script will run docker-compose-generator in a container to generate the yml files +if (-not ($BTCPAYGEN_DOCKER_IMAGE)) { $BTCPAYGEN_DOCKER_IMAGE = "btcpayserver/docker-compose-generator" } -docker pull btcpayserver/docker-compose-generator +docker pull $BTCPAYGEN_DOCKER_IMAGE: docker run -v "$(Get-Location)\Generated:/app/Generated" ` -v "$(Get-Location)\docker-compose-generator\docker-fragments:/app/docker-fragments" ` -e "BTCPAYGEN_CRYPTO1=$BTCPAYGEN_CRYPTO1" ` diff --git a/build.sh b/build.sh index 62b1a65..eba13bd 100755 --- a/build.sh +++ b/build.sh @@ -1,7 +1,7 @@ #!/bin/bash # This script will run docker-compose-generator in a container to generate the yml files -docker pull btcpayserver/docker-compose-generator +docker pull ${BTCPAYGEN_DOCKER_IMAGE:-"btcpayserver/docker-compose-generator"} docker run -v "$(pwd)/Generated:/app/Generated" \ -v "$(pwd)/docker-compose-generator/docker-fragments:/app/docker-fragments" \ -e "BTCPAYGEN_CRYPTO1=$BTCPAYGEN_CRYPTO1" \ From cf49b20083296b684418d4ff9a616b18cb7cc6bd Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Sun, 16 Sep 2018 18:29:38 +0200 Subject: [PATCH 03/14] run cusom image as well --- build.ps1 | 2 +- build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.ps1 b/build.ps1 index 89ed908..d02efbd 100755 --- a/build.ps1 +++ b/build.ps1 @@ -17,7 +17,7 @@ docker run -v "$(Get-Location)\Generated:/app/Generated" ` -e "BTCPAYGEN_ADDITIONAL_FRAGMENTS=$BTCPAYGEN_ADDITIONAL_FRAGMENTS" ` -e "BTCPAYGEN_LIGHTNING=$BTCPAYGEN_LIGHTNING" ` -e "BTCPAYGEN_SUBNAME=$BTCPAYGEN_SUBNAME" ` - --rm btcpayserver/docker-compose-generator + --rm $BTCPAYGEN_DOCKER_IMAGE If ($BTCPAYGEN_REVERSEPROXY -eq "nginx") { Copy-Item ".\Production\nginx.tmpl" -Destination ".\Generated" diff --git a/build.sh b/build.sh index eba13bd..7f82e69 100755 --- a/build.sh +++ b/build.sh @@ -17,7 +17,7 @@ docker run -v "$(pwd)/Generated:/app/Generated" \ -e "BTCPAYGEN_ADDITIONAL_FRAGMENTS=$BTCPAYGEN_ADDITIONAL_FRAGMENTS" \ -e "BTCPAYGEN_LIGHTNING=$BTCPAYGEN_LIGHTNING" \ -e "BTCPAYGEN_SUBNAME=$BTCPAYGEN_SUBNAME" \ - --rm btcpayserver/docker-compose-generator + --rm ${BTCPAYGEN_DOCKER_IMAGE:-"btcpayserver/docker-compose-generator"} if [ "$BTCPAYGEN_REVERSEPROXY" == "nginx" ]; then cp Production/nginx.tmpl Generated/nginx.tmpl From 1da3c4ee6abd37bf7cc0cb57dadb2dc2c13306be Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Mon, 17 Sep 2018 10:43:31 +0200 Subject: [PATCH 04/14] add cli and lowercase dash identifier --- dash-cli.ps1 | 1 + dash-cli.sh | 3 +++ docker-compose-generator/src/CryptoDefinition.cs | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 dash-cli.ps1 create mode 100644 dash-cli.sh diff --git a/dash-cli.ps1 b/dash-cli.ps1 new file mode 100644 index 0000000..dcb6862 --- /dev/null +++ b/dash-cli.ps1 @@ -0,0 +1 @@ +docker exec -ti --user dash btcpayserver_dashd dash-cli $args \ No newline at end of file diff --git a/dash-cli.sh b/dash-cli.sh new file mode 100644 index 0000000..fa2948f --- /dev/null +++ b/dash-cli.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +docker exec -ti --user dash btcpayserver_dashd dash-cli "$@" diff --git a/docker-compose-generator/src/CryptoDefinition.cs b/docker-compose-generator/src/CryptoDefinition.cs index 444d282..2da7d19 100644 --- a/docker-compose-generator/src/CryptoDefinition.cs +++ b/docker-compose-generator/src/CryptoDefinition.cs @@ -68,7 +68,7 @@ namespace DockerGenerator }, new CryptoDefinition() { - Crypto = "DASH", + Crypto = "dash", CryptoFragment = "dash" } }; From 65764292604711021ed8b86805a8f67ad3c5f088 Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Mon, 17 Sep 2018 10:48:02 +0200 Subject: [PATCH 05/14] update docker image for dash --- docker-compose-generator/docker-fragments/dash.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/dash.yml b/docker-compose-generator/docker-fragments/dash.yml index 066c892..dc58ee7 100644 --- a/docker-compose-generator/docker-fragments/dash.yml +++ b/docker-compose-generator/docker-fragments/dash.yml @@ -4,7 +4,7 @@ services: dashd: restart: unless-stopped container_name: btcpayserver_dashd - image: uphold/docker-dash-core:0.12.2.3 + image: uphold/dash-core:0.12.2.3-alpine expose: - "43782" - "39388" From 4e6f56ca773993b111fc96b0a0670598ec89e980 Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Mon, 17 Sep 2018 10:56:38 +0200 Subject: [PATCH 06/14] print dash output --- docker-compose-generator/docker-fragments/dash.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose-generator/docker-fragments/dash.yml b/docker-compose-generator/docker-fragments/dash.yml index dc58ee7..73dcc10 100644 --- a/docker-compose-generator/docker-fragments/dash.yml +++ b/docker-compose-generator/docker-fragments/dash.yml @@ -15,6 +15,7 @@ services: -rpcport=43782 -port=39388 -whitelist=0.0.0.0/0 + -printtoconsole nbxplorer: environment: NBXPLORER_CHAINS: "DASH" From 18ce4f7395489baf5825f8fddfd3b24447e69da2 Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Mon, 17 Sep 2018 11:50:44 +0200 Subject: [PATCH 07/14] expose prots for dash --- docker-compose-generator/docker-fragments/dash.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker-compose-generator/docker-fragments/dash.yml b/docker-compose-generator/docker-fragments/dash.yml index 73dcc10..4038db9 100644 --- a/docker-compose-generator/docker-fragments/dash.yml +++ b/docker-compose-generator/docker-fragments/dash.yml @@ -8,6 +8,11 @@ services: expose: - "43782" - "39388" + ports: + -"9999:9999" + -"9998:9998" + -"19999:19999" + -"19998:19998" volumes: - "dash_datadir:/home/dash/.dashcore" command: From ae569e3b43cc72ce4a60a7d50acb987acaa9425d Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Mon, 17 Sep 2018 11:58:15 +0200 Subject: [PATCH 08/14] fix yaml --- docker-compose-generator/docker-fragments/dash.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose-generator/docker-fragments/dash.yml b/docker-compose-generator/docker-fragments/dash.yml index 4038db9..f7a9e10 100644 --- a/docker-compose-generator/docker-fragments/dash.yml +++ b/docker-compose-generator/docker-fragments/dash.yml @@ -9,10 +9,10 @@ services: - "43782" - "39388" ports: - -"9999:9999" - -"9998:9998" - -"19999:19999" - -"19998:19998" + - "9999:9999" + - "9998:9998" + - "19999:19999" + - "19998:19998" volumes: - "dash_datadir:/home/dash/.dashcore" command: From 1bf3aa8590bc89e147fcf631e5b75b63738613b0 Mon Sep 17 00:00:00 2001 From: snogcel Date: Mon, 26 Nov 2018 16:36:30 -0700 Subject: [PATCH 09/14] 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: From 1aa58948956a58716a5bb946c4ca97ad3850984e Mon Sep 17 00:00:00 2001 From: snogcel Date: Tue, 27 Nov 2018 13:01:19 -0700 Subject: [PATCH 10/14] adjust dash docker image --- docker-compose-generator/docker-fragments/dash.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose-generator/docker-fragments/dash.yml b/docker-compose-generator/docker-fragments/dash.yml index 37b8948..25fb3c4 100644 --- a/docker-compose-generator/docker-fragments/dash.yml +++ b/docker-compose-generator/docker-fragments/dash.yml @@ -4,9 +4,9 @@ services: dashd: restart: unless-stopped container_name: btcpayserver_dashd - image: snogcel/docker-dash-core:latest + image: snogcel/docker-dash:0.12.3 environment: - DASH_EXTRA_ARGS: | + BITCOIN_EXTRA_ARGS: | printtoconsole=1 rpcallowip=::/0 rpcport=9998 @@ -17,7 +17,7 @@ services: - "9998" - "9999" volumes: - - "dash_datadir:/home/dash/.dashcore" + - "dash_datadir:/data" nbxplorer: environment: NBXPLORER_CHAINS: "dash" From 2961c5fe457af021f685581e6821a12c1aea778c Mon Sep 17 00:00:00 2001 From: snogcel Date: Tue, 27 Nov 2018 13:06:35 -0700 Subject: [PATCH 11/14] remove unnecessary arguments --- docker-compose-generator/docker-fragments/dash.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docker-compose-generator/docker-fragments/dash.yml b/docker-compose-generator/docker-fragments/dash.yml index 25fb3c4..7dbab8c 100644 --- a/docker-compose-generator/docker-fragments/dash.yml +++ b/docker-compose-generator/docker-fragments/dash.yml @@ -7,11 +7,9 @@ services: image: snogcel/docker-dash:0.12.3 environment: BITCOIN_EXTRA_ARGS: | - printtoconsole=1 - rpcallowip=::/0 - rpcport=9998 ${NBITCOIN_NETWORK:-regtest}=1 port=9999 + rpcport=9998 whitelist=0.0.0.0/0 expose: - "9998" From 73b6f796d26d8afa7a70dae2443a9f035bed549c Mon Sep 17 00:00:00 2001 From: snogcel Date: Tue, 27 Nov 2018 21:01:24 -0700 Subject: [PATCH 12/14] adjust dash datadir --- dash-cli.ps1 | 2 +- dash-cli.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dash-cli.ps1 b/dash-cli.ps1 index 2a18267..8b5ac65 100755 --- a/dash-cli.ps1 +++ b/dash-cli.ps1 @@ -1 +1 @@ -docker exec -ti btcpayserver_dashd dash-cli -datadir="/home/dash/.dashcore" $args \ No newline at end of file +docker exec -ti btcpayserver_dashd dash-cli -datadir="/data" $args diff --git a/dash-cli.sh b/dash-cli.sh index 02fe5b3..6fdea5f 100755 --- a/dash-cli.sh +++ b/dash-cli.sh @@ -1,3 +1,3 @@ #!/bin/bash -docker exec -ti btcpayserver_dashd dash-cli -datadir="/home/dash/.dashcore" "$@" +docker exec -ti btcpayserver_dashd dash-cli -datadir="/data" "$@" From 35d4dd0a613e63b8e65b6fb388726aac9938affa Mon Sep 17 00:00:00 2001 From: snogcel Date: Mon, 3 Dec 2018 15:45:40 -0700 Subject: [PATCH 13/14] adjust docker image --- docker-compose-generator/docker-fragments/dash.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/dash.yml b/docker-compose-generator/docker-fragments/dash.yml index 7dbab8c..6693606 100644 --- a/docker-compose-generator/docker-fragments/dash.yml +++ b/docker-compose-generator/docker-fragments/dash.yml @@ -4,7 +4,7 @@ services: dashd: restart: unless-stopped container_name: btcpayserver_dashd - image: snogcel/docker-dash:0.12.3 + image: snogcel/docker-dash-linuxamd64:0.12.3 environment: BITCOIN_EXTRA_ARGS: | ${NBITCOIN_NETWORK:-regtest}=1 From 5127d351bcc933a57021ef21c2246661112b4acd Mon Sep 17 00:00:00 2001 From: snogcel Date: Mon, 3 Dec 2018 22:00:43 -0700 Subject: [PATCH 14/14] adjust docker image --- docker-compose-generator/docker-fragments/dash.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/dash.yml b/docker-compose-generator/docker-fragments/dash.yml index 6693606..922f904 100644 --- a/docker-compose-generator/docker-fragments/dash.yml +++ b/docker-compose-generator/docker-fragments/dash.yml @@ -4,7 +4,7 @@ services: dashd: restart: unless-stopped container_name: btcpayserver_dashd - image: snogcel/docker-dash-linuxamd64:0.12.3 + image: btcpayserver/dash:0.12.3 environment: BITCOIN_EXTRA_ARGS: | ${NBITCOIN_NETWORK:-regtest}=1