From 164e583736475e4fc15620b43dec66dbd645b132 Mon Sep 17 00:00:00 2001 From: rockstardev Date: Fri, 23 Nov 2018 08:17:21 -0600 Subject: [PATCH 01/27] Adding dogecoin docker fragment --- .../docker-fragments/dogecoin.yml | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 docker-compose-generator/docker-fragments/dogecoin.yml diff --git a/docker-compose-generator/docker-fragments/dogecoin.yml b/docker-compose-generator/docker-fragments/dogecoin.yml new file mode 100644 index 0000000..11167e3 --- /dev/null +++ b/docker-compose-generator/docker-fragments/dogecoin.yml @@ -0,0 +1,40 @@ +version: "3" + +services: + dogecoind: + restart: unless-stopped + container_name: btcpayserver_dogecoind + image: btcpayserver/dogecoin:1.10.0 + environment: + BITCOIN_EXTRA_ARGS: | + rpcuser=ceiwHEbqWI83 + rpcpassword=DwubwWsoo3 + ${NBITCOIN_NETWORK:-regtest}=1 + server=1 + rpcport=22555 + port=22556 + whitelist=0.0.0.0/0 + ports: + - "22555:22555" + expose: + - "22555" # RPC + - "22556" # P2P + volumes: + - "dogecoin_datadir:/data" + nbxplorer: + environment: + NBXPLORER_CHAINS: "doge" + NBXPLORER_VIARPCURL: http://dogecoind:22555/ + NBXPLORER_VIANODEENDPOINT: dogecoind:22556 + NBXPLORER_DOGERPCUSER: ceiwHEbqWI83 + NBXPLORER_DOGERPCPASSWORD: DwubwWsoo3 + links: + - dogecoind + volumes: + - "dogecoin_datadir:/root/.dogecoin" + btcpayserver: + environment: + BTCPAY_CHAINS: "doge" + BTCPAY_DOGEEXPLORERURL: http://nbxplorer:32838/ +volumes: + dogecoin_datadir: From ebce6c4b2416deec3bca4b0500310acea68519a7 Mon Sep 17 00:00:00 2001 From: rockstardev Date: Fri, 23 Nov 2018 08:52:05 -0600 Subject: [PATCH 02/27] Updating image location, bugfixing DOGECOIN_EXTRA_ARGS, comment --- docker-compose-generator/docker-fragments/dogecoin.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docker-compose-generator/docker-fragments/dogecoin.yml b/docker-compose-generator/docker-fragments/dogecoin.yml index 11167e3..b5777bf 100644 --- a/docker-compose-generator/docker-fragments/dogecoin.yml +++ b/docker-compose-generator/docker-fragments/dogecoin.yml @@ -4,9 +4,9 @@ services: dogecoind: restart: unless-stopped container_name: btcpayserver_dogecoind - image: btcpayserver/dogecoin:1.10.0 + image: rockstardev/dogecoin:1.10.0 environment: - BITCOIN_EXTRA_ARGS: | + DOGECOIN_EXTRA_ARGS: | rpcuser=ceiwHEbqWI83 rpcpassword=DwubwWsoo3 ${NBITCOIN_NETWORK:-regtest}=1 @@ -14,6 +14,9 @@ services: rpcport=22555 port=22556 whitelist=0.0.0.0/0 + # Reducing memory usage of dogecoind. Don't try running this container without at least 2 GB of memory + # https://www.reddit.com/r/dogecoin/comments/5wynqe/reducing_memory_usage_of_dogecoind/ + dbcache=50 ports: - "22555:22555" expose: From c51692a6b15b43aded653384e0dbf87cc2922a54 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Sat, 24 Nov 2018 21:32:15 +0900 Subject: [PATCH 03/27] simplify btcpay-setup.sh --- btcpay-setup.sh | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/btcpay-setup.sh b/btcpay-setup.sh index d62a88d..471fa8e 100755 --- a/btcpay-setup.sh +++ b/btcpay-setup.sh @@ -192,15 +192,8 @@ export BTCPAY_DOCKER_COMPOSE=\"$BTCPAY_DOCKER_COMPOSE\" export BTCPAY_BASE_DIRECTORY=\"$BTCPAY_BASE_DIRECTORY\" export BTCPAY_ENV_FILE=\"$BTCPAY_ENV_FILE\" export BTCPAY_HOST_SSHKEYFILE=\"$BTCPAY_HOST_SSHKEYFILE\" -if cat \$BTCPAY_ENV_FILE &> /dev/null; then -export BTCPAY_HOST=\"\$(cat \$BTCPAY_ENV_FILE | sed -n 's/^BTCPAY_HOST=\(.*\)$/\1/p')\" -export BTCPAY_IMAGE=\"\$(cat \$BTCPAY_ENV_FILE | sed -n 's/^BTCPAY_IMAGE=\(.*\)$/\1/p')\" -export LETSENCRYPT_EMAIL=\"\$(cat \$BTCPAY_ENV_FILE | sed -n 's/^LETSENCRYPT_EMAIL=\(.*\)$/\1/p')\" -export NBITCOIN_NETWORK=\"\$(cat \$BTCPAY_ENV_FILE | sed -n 's/^NBITCOIN_NETWORK=\(.*\)$/\1/p')\" -export LIGHTNING_ALIAS=\"\$(cat \$BTCPAY_ENV_FILE | sed -n 's/^LIGHTNING_ALIAS=\(.*\)$/\1/p')\" -export ACME_CA_URI=\"\$(cat \$BTCPAY_ENV_FILE | sed -n 's/^ACME_CA_URI=\(.*\)$/\1/p')\" -export BTCPAY_SSHKEYFILE=\"\$(cat \$BTCPAY_ENV_FILE | sed -n 's/^BTCPAY_SSHKEYFILE=\(.*\)$/\1/p')\" -export BTCPAY_SSHTRUSTEDFINGERPRINTS=\"\$(cat \$BTCPAY_ENV_FILE | sed -n 's/^BTCPAY_SSHTRUSTEDFINGERPRINTS=\(.*\)$/\1/p')\" +if cat \"\$BTCPAY_ENV_FILE\" &> /dev/null; then + export \$(grep -v '^#' \"\$BTCPAY_ENV_FILE\" | xargs) fi " > /etc/profile.d/btcpay-env.sh chmod +x /etc/profile.d/btcpay-env.sh From 221b19216b3292f68edd0867ed2cf9cf69fc27d2 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Mon, 26 Nov 2018 11:54:35 +0900 Subject: [PATCH 04/27] Rename docker files --- .circleci/config.yml | 10 +++++----- docker-compose-generator/docker-compose-generator.sln | 4 ++-- .../{Dockerfile.linuxamd64 => linuxamd64.Dockerfile} | 0 ...Dockerfile.linuxarm32v7 => linuxarm32v7.Dockerfile} | 0 4 files changed, 7 insertions(+), 7 deletions(-) rename docker-compose-generator/{Dockerfile.linuxamd64 => linuxamd64.Dockerfile} (100%) rename docker-compose-generator/{Dockerfile.linuxarm32v7 => linuxarm32v7.Dockerfile} (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 89778d6..0d8412e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,10 +11,10 @@ jobs: command: | cd docker-compose-generator sudo docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS - sudo docker build --pull -t $DOCKERHUB_REPO:latest-amd64 -f Dockerfile.linuxamd64 . + sudo docker build --pull -t $DOCKERHUB_REPO:latest-amd64 -f linuxamd64.Dockerfile . sudo docker push $DOCKERHUB_REPO:latest-amd64 - publish_docker_linuxarm: + publish_docker_linuxarm32v7: machine: docker_layer_caching: true steps: @@ -25,7 +25,7 @@ jobs: # cd docker-compose-generator sudo docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS - sudo docker build --pull -t $DOCKERHUB_REPO:latest-arm32v7 -f Dockerfile.linuxarm32v7 . + sudo docker build --pull -t $DOCKERHUB_REPO:latest-arm32v7 -f linuxarm32v7.Dockerfile . sudo docker push $DOCKERHUB_REPO:latest-arm32v7 publish_docker_multiarch: @@ -54,14 +54,14 @@ workflows: filters: branches: only: dcg-latest - - publish_docker_linuxarm: + - publish_docker_linuxarm32v7: filters: branches: only: dcg-latest - publish_docker_multiarch: requires: - publish_docker_linuxamd64 - - publish_docker_linuxarm + - publish_docker_linuxarm32v7 filters: branches: only: dcg-latest diff --git a/docker-compose-generator/docker-compose-generator.sln b/docker-compose-generator/docker-compose-generator.sln index 2cd718a..30e85e0 100644 --- a/docker-compose-generator/docker-compose-generator.sln +++ b/docker-compose-generator/docker-compose-generator.sln @@ -8,8 +8,8 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{8C1C711D-DEF1-474C-A9F6-AAE142412528}" ProjectSection(SolutionItems) = preProject ..\.circleci\config.yml = ..\.circleci\config.yml - Dockerfile.linuxamd64 = Dockerfile.linuxamd64 - Dockerfile.linuxarm32v7 = Dockerfile.linuxarm32v7 + linuxamd64.Dockerfile = linuxamd64.Dockerfile + linuxarm32v7.Dockerfile = linuxarm32v7.Dockerfile EndProjectSection EndProject Global diff --git a/docker-compose-generator/Dockerfile.linuxamd64 b/docker-compose-generator/linuxamd64.Dockerfile similarity index 100% rename from docker-compose-generator/Dockerfile.linuxamd64 rename to docker-compose-generator/linuxamd64.Dockerfile diff --git a/docker-compose-generator/Dockerfile.linuxarm32v7 b/docker-compose-generator/linuxarm32v7.Dockerfile similarity index 100% rename from docker-compose-generator/Dockerfile.linuxarm32v7 rename to docker-compose-generator/linuxarm32v7.Dockerfile From 9fbf4ca3cc14bd0c0ab509d8a2f622fa62e249a3 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Mon, 26 Nov 2018 11:55:11 +0900 Subject: [PATCH 05/27] Change bitcoin core base image --- docker-compose-generator/docker-fragments/bitcoin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/bitcoin.yml b/docker-compose-generator/docker-fragments/bitcoin.yml index b41f881..84a10ea 100644 --- a/docker-compose-generator/docker-fragments/bitcoin.yml +++ b/docker-compose-generator/docker-fragments/bitcoin.yml @@ -4,7 +4,7 @@ services: bitcoind: restart: unless-stopped container_name: btcpayserver_bitcoind - image: nicolasdorier/docker-bitcoin:0.17.0 + image: btcpayserver/bitcoin:0.17.0 environment: BITCOIN_NETWORK: ${NBITCOIN_NETWORK:-regtest} BITCOIN_EXTRA_ARGS: | From 0d079432a26316d65fd5e46a280ac8920b8f69db Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Mon, 26 Nov 2018 11:59:45 +0900 Subject: [PATCH 06/27] bump nbx --- docker-compose-generator/docker-fragments/nbxplorer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/nbxplorer.yml b/docker-compose-generator/docker-fragments/nbxplorer.yml index ca5f5a1..511d1af 100644 --- a/docker-compose-generator/docker-fragments/nbxplorer.yml +++ b/docker-compose-generator/docker-fragments/nbxplorer.yml @@ -4,7 +4,7 @@ services: nbxplorer: restart: unless-stopped - image: nicolasdorier/nbxplorer:1.1.0.18 + image: nicolasdorier/nbxplorer:2.0.0.1 expose: - "32838" environment: From f1c6b39c44651d06acedcb1e5842fa299fb1c439 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Mon, 26 Nov 2018 12:01:03 +0900 Subject: [PATCH 07/27] fix nbx --- docker-compose-generator/docker-fragments/nbxplorer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/nbxplorer.yml b/docker-compose-generator/docker-fragments/nbxplorer.yml index 511d1af..b979eba 100644 --- a/docker-compose-generator/docker-fragments/nbxplorer.yml +++ b/docker-compose-generator/docker-fragments/nbxplorer.yml @@ -4,7 +4,7 @@ services: nbxplorer: restart: unless-stopped - image: nicolasdorier/nbxplorer:2.0.0.1 + image: dgarage/nbxplorer:2.0.0.1 expose: - "32838" environment: From 7a2a772b12e947b50de6cbafcbe9413de8c0a64a Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Mon, 26 Nov 2018 12:01:19 +0900 Subject: [PATCH 08/27] Revert "fix nbx" This reverts commit f1c6b39c44651d06acedcb1e5842fa299fb1c439. --- docker-compose-generator/docker-fragments/nbxplorer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/nbxplorer.yml b/docker-compose-generator/docker-fragments/nbxplorer.yml index b979eba..511d1af 100644 --- a/docker-compose-generator/docker-fragments/nbxplorer.yml +++ b/docker-compose-generator/docker-fragments/nbxplorer.yml @@ -4,7 +4,7 @@ services: nbxplorer: restart: unless-stopped - image: dgarage/nbxplorer:2.0.0.1 + image: nicolasdorier/nbxplorer:2.0.0.1 expose: - "32838" environment: From 65db53b9f97d65f1ac6c0445767cc3d12dc8e821 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Mon, 26 Nov 2018 12:17:48 +0900 Subject: [PATCH 09/27] add echo about a setup step taking time --- btcpay-setup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/btcpay-setup.sh b/btcpay-setup.sh index 471fa8e..b873f21 100755 --- a/btcpay-setup.sh +++ b/btcpay-setup.sh @@ -285,6 +285,7 @@ ExecReload=/bin/bash -c '. /etc/profile.d/btcpay-env.sh && cd \"\$(dirname \$BTC WantedBy=multi-user.target" > /etc/systemd/system/btcpayserver.service echo -e "BTCPay Server systemd configured in /etc/systemd/system/btcpayserver.service\n" +echo "BTCPay Server starting... this can take 5 to 10 minutes..." systemctl daemon-reload systemctl enable btcpayserver systemctl start btcpayserver From b452e3482e16f71454286ba6c37ee741dce83830 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Mon, 26 Nov 2018 12:23:35 +0900 Subject: [PATCH 10/27] update btcpay image --- docker-compose-generator/docker-fragments/btcpayserver.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml index 59397a7..293effb 100644 --- a/docker-compose-generator/docker-fragments/btcpayserver.yml +++ b/docker-compose-generator/docker-fragments/btcpayserver.yml @@ -4,7 +4,7 @@ services: btcpayserver: restart: unless-stopped - image: ${BTCPAY_IMAGE:-nicolasdorier/btcpayserver:1.0.3.16} + image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.0.3.17} expose: - "49392" environment: From aac9d0fb9e58bc359048e3ce3e860e68ac001835 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Mon, 26 Nov 2018 16:25:24 +0900 Subject: [PATCH 11/27] update docker-gen --- docker-compose-generator/docker-fragments/nginx.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/nginx.yml b/docker-compose-generator/docker-fragments/nginx.yml index d8e1081..e41ee03 100644 --- a/docker-compose-generator/docker-fragments/nginx.yml +++ b/docker-compose-generator/docker-fragments/nginx.yml @@ -18,7 +18,7 @@ services: nginx-gen: restart: unless-stopped - image: jwilder/docker-gen + image: btcpayserver/docker-gen:0.7.4 container_name: nginx-gen volumes: - "/var/run/docker.sock:/tmp/docker.sock:ro" From eec78bc46052411760cbc504b2d85b97ab347fa0 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Mon, 26 Nov 2018 17:25:23 +0900 Subject: [PATCH 12/27] bump proxy companion --- docker-compose-generator/docker-fragments/nginx.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/nginx.yml b/docker-compose-generator/docker-fragments/nginx.yml index e41ee03..86f8655 100644 --- a/docker-compose-generator/docker-fragments/nginx.yml +++ b/docker-compose-generator/docker-fragments/nginx.yml @@ -33,7 +33,7 @@ services: letsencrypt-nginx-proxy-companion: restart: unless-stopped - image: jrcs/letsencrypt-nginx-proxy-companion + image: btcpayserver/letsencrypt-nginx-proxy-companion:1.9.1 container_name: letsencrypt-nginx-proxy-companion volumes: - "/var/run/docker.sock:/var/run/docker.sock:ro" From 697112b843b4ef69a9777627d05471998b5e4676 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Mon, 26 Nov 2018 17:54:56 +0900 Subject: [PATCH 13/27] bump companion --- docker-compose-generator/docker-fragments/nginx.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/nginx.yml b/docker-compose-generator/docker-fragments/nginx.yml index 86f8655..9084d5a 100644 --- a/docker-compose-generator/docker-fragments/nginx.yml +++ b/docker-compose-generator/docker-fragments/nginx.yml @@ -33,7 +33,7 @@ services: letsencrypt-nginx-proxy-companion: restart: unless-stopped - image: btcpayserver/letsencrypt-nginx-proxy-companion:1.9.1 + image: btcpayserver/letsencrypt-nginx-proxy-companion:1.10.0 container_name: letsencrypt-nginx-proxy-companion volumes: - "/var/run/docker.sock:/var/run/docker.sock:ro" From 043648eac461370de14fb020e0d5ebbe10f62bfe Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Mon, 26 Nov 2018 19:25:45 +0900 Subject: [PATCH 14/27] Use get-docket for setting up docker --- btcpay-setup.sh | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/btcpay-setup.sh b/btcpay-setup.sh index b873f21..790823d 100755 --- a/btcpay-setup.sh +++ b/btcpay-setup.sh @@ -223,33 +223,31 @@ if ! [ -x "$(command -v docker)" ] || ! [ -x "$(command -v docker-compose)" ]; t ca-certificates \ software-properties-common \ 2>error - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - - if [ $(lsb_release -cs) == "bionic" ]; then - # Bionic not in the repo yet, see https://linuxconfig.org/how-to-install-docker-on-ubuntu-18-04-bionic-beaver - add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu artful stable" - else - add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" + if ! [ -x "$(command -v docker)" ]; then + echo "Trying to install docker..." + curl -fsSL https://get.docker.com -o get-docker.sh + chmod +x get-docker.sh + sh get-docker.sh + rm get-docker.sh + fi + if ! [ -x "$(command -v docker-compose)" ]; then + if [[ "$(uname -s)" == "x86_64" ]]; then + DOCKER_COMPOSE_DOWNLOAD="https://github.com/docker/compose/releases/download/1.17.1/docker-compose-$(uname -s)-$(uname -m)" + echo "Trying to install docker-compose by downloading on $DOCKER_COMPOSE_DOWNLOAD" + curl -L "$DOCKER_COMPOSE_DOWNLOAD" -o /usr/local/bin/docker-compose + chmod +x /usr/local/bin/docker-compose + fi fi - apt-get update 2>error fi if ! [ -x "$(command -v docker)" ]; then - if apt-get install -y docker-ce ; then - echo "Docker installed" - else - echo "Failed to install docker" - return - fi -else - echo -e "docker is already installed\n" + echo "Failed to install docker" + return fi -# Install docker-compose if ! [ -x "$(command -v docker-compose)" ]; then - curl -L https://github.com/docker/compose/releases/download/1.17.1/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose - chmod +x /usr/local/bin/docker-compose -else - echo -e "docker-compose is already installed\n" + echo "Failed to install docker-compose" + return fi # Generate the docker compose in BTCPAY_DOCKER_COMPOSE From 6547d61b7d9aab824c28053ac1c22603d391eb13 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Mon, 26 Nov 2018 19:33:22 +0900 Subject: [PATCH 15/27] fix setup --- btcpay-setup.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/btcpay-setup.sh b/btcpay-setup.sh index 790823d..fd7ffa0 100755 --- a/btcpay-setup.sh +++ b/btcpay-setup.sh @@ -230,15 +230,15 @@ if ! [ -x "$(command -v docker)" ] || ! [ -x "$(command -v docker-compose)" ]; t sh get-docker.sh rm get-docker.sh fi - if ! [ -x "$(command -v docker-compose)" ]; then - if [[ "$(uname -s)" == "x86_64" ]]; then - DOCKER_COMPOSE_DOWNLOAD="https://github.com/docker/compose/releases/download/1.17.1/docker-compose-$(uname -s)-$(uname -m)" - echo "Trying to install docker-compose by downloading on $DOCKER_COMPOSE_DOWNLOAD" - curl -L "$DOCKER_COMPOSE_DOWNLOAD" -o /usr/local/bin/docker-compose - chmod +x /usr/local/bin/docker-compose - fi +if ! [ -x "$(command -v docker-compose)" ]; then + if [[ "$(uname -m)" == "x86_64" ]]; then + DOCKER_COMPOSE_DOWNLOAD="https://github.com/docker/compose/releases/download/1.17.1/docker-compose-$(uname -s)-$(uname -m)" + echo "Trying to install docker-compose by downloading on $DOCKER_COMPOSE_DOWNLOAD" + curl -L "$DOCKER_COMPOSE_DOWNLOAD" -o /usr/local/bin/docker-compose + chmod +x /usr/local/bin/docker-compose fi fi +fi if ! [ -x "$(command -v docker)" ]; then echo "Failed to install docker" From 50c58f5ba626c83155d8315eaf224edfa40e7e98 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Mon, 26 Nov 2018 19:34:51 +0900 Subject: [PATCH 16/27] fix indent --- btcpay-setup.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/btcpay-setup.sh b/btcpay-setup.sh index fd7ffa0..ae75e80 100755 --- a/btcpay-setup.sh +++ b/btcpay-setup.sh @@ -230,15 +230,15 @@ if ! [ -x "$(command -v docker)" ] || ! [ -x "$(command -v docker-compose)" ]; t sh get-docker.sh rm get-docker.sh fi -if ! [ -x "$(command -v docker-compose)" ]; then - if [[ "$(uname -m)" == "x86_64" ]]; then - DOCKER_COMPOSE_DOWNLOAD="https://github.com/docker/compose/releases/download/1.17.1/docker-compose-$(uname -s)-$(uname -m)" - echo "Trying to install docker-compose by downloading on $DOCKER_COMPOSE_DOWNLOAD" - curl -L "$DOCKER_COMPOSE_DOWNLOAD" -o /usr/local/bin/docker-compose - chmod +x /usr/local/bin/docker-compose + if ! [ -x "$(command -v docker-compose)" ]; then + if [[ "$(uname -m)" == "x86_64" ]]; then + DOCKER_COMPOSE_DOWNLOAD="https://github.com/docker/compose/releases/download/1.17.1/docker-compose-$(uname -s)-$(uname -m)" + echo "Trying to install docker-compose by downloading on $DOCKER_COMPOSE_DOWNLOAD" + curl -L "$DOCKER_COMPOSE_DOWNLOAD" -o /usr/local/bin/docker-compose + chmod +x /usr/local/bin/docker-compose + fi fi fi -fi if ! [ -x "$(command -v docker)" ]; then echo "Failed to install docker" From 6eb9a46d18e35cc82d93367e3a93cc2af6b1147d Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Tue, 27 Nov 2018 11:23:50 +0900 Subject: [PATCH 17/27] do not apt-get if curl is already installed --- btcpay-setup.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/btcpay-setup.sh b/btcpay-setup.sh index ae75e80..0881af1 100755 --- a/btcpay-setup.sh +++ b/btcpay-setup.sh @@ -216,13 +216,15 @@ echo -e "BTCPay Server docker-compose parameters saved in $BTCPAY_ENV_FILE\n" . /etc/profile.d/btcpay-env.sh if ! [ -x "$(command -v docker)" ] || ! [ -x "$(command -v docker-compose)" ]; then - apt-get update 2>error - apt-get install -y \ - curl \ - apt-transport-https \ - ca-certificates \ - software-properties-common \ - 2>error + if ! [ -x "$(command -v curl)" ]; then + apt-get update 2>error + apt-get install -y \ + curl \ + apt-transport-https \ + ca-certificates \ + software-properties-common \ + 2>error + fi if ! [ -x "$(command -v docker)" ]; then echo "Trying to install docker..." curl -fsSL https://get.docker.com -o get-docker.sh From 8e1ad95ad10d3db59a22f3568bdd08ebd867ad11 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Tue, 27 Nov 2018 11:41:11 +0900 Subject: [PATCH 18/27] do not need to install curl, as get-docker.sh install it for us --- btcpay-setup.sh | 9 --------- 1 file changed, 9 deletions(-) diff --git a/btcpay-setup.sh b/btcpay-setup.sh index 0881af1..641e77b 100755 --- a/btcpay-setup.sh +++ b/btcpay-setup.sh @@ -216,15 +216,6 @@ echo -e "BTCPay Server docker-compose parameters saved in $BTCPAY_ENV_FILE\n" . /etc/profile.d/btcpay-env.sh if ! [ -x "$(command -v docker)" ] || ! [ -x "$(command -v docker-compose)" ]; then - if ! [ -x "$(command -v curl)" ]; then - apt-get update 2>error - apt-get install -y \ - curl \ - apt-transport-https \ - ca-certificates \ - software-properties-common \ - 2>error - fi if ! [ -x "$(command -v docker)" ]; then echo "Trying to install docker..." curl -fsSL https://get.docker.com -o get-docker.sh From 97eefe38678289334c01557d99fb0ec43eaa95a4 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Tue, 27 Nov 2018 11:41:58 +0900 Subject: [PATCH 19/27] Revert "do not need to install curl, as get-docker.sh install it for us" This reverts commit 8e1ad95ad10d3db59a22f3568bdd08ebd867ad11. --- btcpay-setup.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/btcpay-setup.sh b/btcpay-setup.sh index 641e77b..0881af1 100755 --- a/btcpay-setup.sh +++ b/btcpay-setup.sh @@ -216,6 +216,15 @@ echo -e "BTCPay Server docker-compose parameters saved in $BTCPAY_ENV_FILE\n" . /etc/profile.d/btcpay-env.sh if ! [ -x "$(command -v docker)" ] || ! [ -x "$(command -v docker-compose)" ]; then + if ! [ -x "$(command -v curl)" ]; then + apt-get update 2>error + apt-get install -y \ + curl \ + apt-transport-https \ + ca-certificates \ + software-properties-common \ + 2>error + fi if ! [ -x "$(command -v docker)" ]; then echo "Trying to install docker..." curl -fsSL https://get.docker.com -o get-docker.sh From 4273e97d373a8b9c3860314862b39dc545c3c39f Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Tue, 27 Nov 2018 13:08:00 +0900 Subject: [PATCH 20/27] Use the docker-compose-builder for armv32 docker-compose deployment --- btcpay-setup.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/btcpay-setup.sh b/btcpay-setup.sh index 0881af1..026c846 100755 --- a/btcpay-setup.sh +++ b/btcpay-setup.sh @@ -235,9 +235,16 @@ if ! [ -x "$(command -v docker)" ] || ! [ -x "$(command -v docker-compose)" ]; t if ! [ -x "$(command -v docker-compose)" ]; then if [[ "$(uname -m)" == "x86_64" ]]; then DOCKER_COMPOSE_DOWNLOAD="https://github.com/docker/compose/releases/download/1.17.1/docker-compose-$(uname -s)-$(uname -m)" - echo "Trying to install docker-compose by downloading on $DOCKER_COMPOSE_DOWNLOAD" + echo "Trying to install docker-compose by downloading on $DOCKER_COMPOSE_DOWNLOAD ($(uname -m))" curl -L "$DOCKER_COMPOSE_DOWNLOAD" -o /usr/local/bin/docker-compose chmod +x /usr/local/bin/docker-compose + else + echo "Trying to install docker-compose by using the docker-compose-builder ($(uname -m))" + ! [ -d "dist" ] && mkdir dist + docker run --rm -ti -v "$(pwd)/dist:/dist" btcpayserver/docker-compose-builder:1.22.0 + mv dist/docker-compose /usr/local/bin/docker-compose + chmod +x /usr/local/bin/docker-compose + rm -rf "dist" fi fi fi From 973066aaf2e289a7980698a68c9a0504742c0a9f Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Tue, 27 Nov 2018 11:46:51 +0100 Subject: [PATCH 21/27] add missing doge-cli scripts --- dogecoin-cli.ps1 | 1 + dogecoin-cli.sh | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 dogecoin-cli.ps1 create mode 100644 dogecoin-cli.sh diff --git a/dogecoin-cli.ps1 b/dogecoin-cli.ps1 new file mode 100644 index 0000000..7d49051 --- /dev/null +++ b/dogecoin-cli.ps1 @@ -0,0 +1 @@ +docker exec -ti btcpayserver_dogecoind dogecoin-cli -datadir="/data" $args diff --git a/dogecoin-cli.sh b/dogecoin-cli.sh new file mode 100644 index 0000000..733ea87 --- /dev/null +++ b/dogecoin-cli.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +docker exec -ti btcpayserver_dogecoind dogecoin-cli -datadir="/data" "$@" From 7ab91baaafbe1c5bd6483f90db0bfe637c48ba2b Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Tue, 27 Nov 2018 12:08:49 +0100 Subject: [PATCH 22/27] add crypto definition for dogecoin --- docker-compose-generator/src/CryptoDefinition.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker-compose-generator/src/CryptoDefinition.cs b/docker-compose-generator/src/CryptoDefinition.cs index 27c638e..4798b56 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 = "doge", + CryptoFragment = "dogecoin" } }; } From c4fe4b1c9d9afe8730fc42805104b3225d173c9a Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Tue, 27 Nov 2018 21:32:03 +0900 Subject: [PATCH 23/27] add opt-save-memory --- README.md | 1 + .../docker-fragments/opt-save-memory.yml | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 docker-compose-generator/docker-fragments/opt-save-memory.yml diff --git a/README.md b/README.md index 881f1df..cf572f1 100644 --- a/README.md +++ b/README.md @@ -155,6 +155,7 @@ Available `BTCPAYGEN_ADDITIONAL_FRAGMENTS` currently are: * [opt-save-storage-xs](docker-compose-generator/docker-fragments/opt-save-storage-xs.yml) will keep around 3 months of blocks (prune BTC for 25 GB) * [opt-save-storage-xxs](docker-compose-generator/docker-fragments/opt-save-storage-xxs.yml) will keep around 2 weeks of blocks (prune BTC for 5 GB) (lightning not supported) * [opt-lnd-autopilot](docker-compose-generator/docker-fragments/opt-lnd-autopilot.yml) will activate auto pilot on LND. (5 channels, 60% of allocation) +* [opt-save-memory](docker-compose-generator/docker-fragments/opt-save-memory.yml) will decrease the default dbcache at the expense of longer synchronization time (Useful if your machine is less than 2GB) You can also create your own [custom fragments](#how-can-i-customize-the-generated-docker-compose-file). diff --git a/docker-compose-generator/docker-fragments/opt-save-memory.yml b/docker-compose-generator/docker-fragments/opt-save-memory.yml new file mode 100644 index 0000000..6e9cfb4 --- /dev/null +++ b/docker-compose-generator/docker-fragments/opt-save-memory.yml @@ -0,0 +1,23 @@ +version: "3" +# If you don't use Lightning Network, you want this +# This save about 2 weeks worth of block + +services: + bitcoind: + environment: + BITCOIN_EXTRA_ARGS: dbcache=300 + bgoldd: + environment: + BITCOIN_EXTRA_ARGS: dbcache=300 + feathercoind: + environment: + BITCOIN_EXTRA_ARGS: dbcache=300 + groestlcoind: + environment: + BITCOIN_EXTRA_ARGS: dbcache=300 + litecoind: + environment: + BITCOIN_EXTRA_ARGS: dbcache=300 + viacoind: + environment: + BITCOIN_EXTRA_ARGS: dbcache=300 \ No newline at end of file From 6b7c66e45a4ffced8974de0b845e365853847f2c Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Tue, 27 Nov 2018 22:13:43 +0900 Subject: [PATCH 24/27] decrease opt-save-memory --- .../docker-fragments/opt-save-memory.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose-generator/docker-fragments/opt-save-memory.yml b/docker-compose-generator/docker-fragments/opt-save-memory.yml index 6e9cfb4..65266ab 100644 --- a/docker-compose-generator/docker-fragments/opt-save-memory.yml +++ b/docker-compose-generator/docker-fragments/opt-save-memory.yml @@ -5,19 +5,19 @@ version: "3" services: bitcoind: environment: - BITCOIN_EXTRA_ARGS: dbcache=300 + BITCOIN_EXTRA_ARGS: dbcache=200 bgoldd: environment: - BITCOIN_EXTRA_ARGS: dbcache=300 + BITCOIN_EXTRA_ARGS: dbcache=200 feathercoind: environment: - BITCOIN_EXTRA_ARGS: dbcache=300 + BITCOIN_EXTRA_ARGS: dbcache=200 groestlcoind: environment: - BITCOIN_EXTRA_ARGS: dbcache=300 + BITCOIN_EXTRA_ARGS: dbcache=200 litecoind: environment: - BITCOIN_EXTRA_ARGS: dbcache=300 + BITCOIN_EXTRA_ARGS: dbcache=200 viacoind: environment: - BITCOIN_EXTRA_ARGS: dbcache=300 \ No newline at end of file + BITCOIN_EXTRA_ARGS: dbcache=200 \ No newline at end of file From a125f7600587c0cd8e436ad684679875d463f84f Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Tue, 27 Nov 2018 22:14:17 +0900 Subject: [PATCH 25/27] Update comment --- docker-compose-generator/docker-fragments/opt-save-memory.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker-compose-generator/docker-fragments/opt-save-memory.yml b/docker-compose-generator/docker-fragments/opt-save-memory.yml index 65266ab..ea75c5a 100644 --- a/docker-compose-generator/docker-fragments/opt-save-memory.yml +++ b/docker-compose-generator/docker-fragments/opt-save-memory.yml @@ -1,6 +1,5 @@ version: "3" -# If you don't use Lightning Network, you want this -# This save about 2 weeks worth of block +# If your machine has less than 1GB of memory, use this services: bitcoind: From d8ac5e4daa128f37c40186ff845c3751a25b1b3c Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Tue, 27 Nov 2018 22:58:39 +0900 Subject: [PATCH 26/27] limit mempoolsize --- .../docker-fragments/opt-save-memory.yml | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/docker-compose-generator/docker-fragments/opt-save-memory.yml b/docker-compose-generator/docker-fragments/opt-save-memory.yml index ea75c5a..90a4479 100644 --- a/docker-compose-generator/docker-fragments/opt-save-memory.yml +++ b/docker-compose-generator/docker-fragments/opt-save-memory.yml @@ -4,19 +4,31 @@ version: "3" services: bitcoind: environment: - BITCOIN_EXTRA_ARGS: dbcache=200 + BITCOIN_EXTRA_ARGS: | + dbcache=150 + maxmempool=100 bgoldd: environment: - BITCOIN_EXTRA_ARGS: dbcache=200 + BITCOIN_EXTRA_ARGS: | + dbcache=150 + maxmempool=100 feathercoind: environment: - BITCOIN_EXTRA_ARGS: dbcache=200 + BITCOIN_EXTRA_ARGS: | + dbcache=150 + maxmempool=100 groestlcoind: environment: - BITCOIN_EXTRA_ARGS: dbcache=200 + BITCOIN_EXTRA_ARGS: | + dbcache=150 + maxmempool=100 litecoind: environment: - BITCOIN_EXTRA_ARGS: dbcache=200 + BITCOIN_EXTRA_ARGS: | + dbcache=150 + maxmempool=100 viacoind: environment: - BITCOIN_EXTRA_ARGS: dbcache=200 \ No newline at end of file + BITCOIN_EXTRA_ARGS: | + dbcache=150 + maxmempool=100 \ No newline at end of file From 0b8f5faf85d5d5e15e4f409ce5b371cc73afa013 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Tue, 27 Nov 2018 23:14:39 +0900 Subject: [PATCH 27/27] Add chmod on dogecoin scripts --- dogecoin-cli.ps1 | 0 dogecoin-cli.sh | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 dogecoin-cli.ps1 mode change 100644 => 100755 dogecoin-cli.sh diff --git a/dogecoin-cli.ps1 b/dogecoin-cli.ps1 old mode 100644 new mode 100755 diff --git a/dogecoin-cli.sh b/dogecoin-cli.sh old mode 100644 new mode 100755