From ed98cf44559e2049d5bf59b4ef14f9a6f741be88 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Wed, 20 Oct 2021 11:14:15 +0900 Subject: [PATCH 1/2] Bump joinmarket to fix receive-payjoin --- .../docker-fragments/opt-add-joinmarket.yml | 7 ++++--- jm.sh | 12 +++++++++++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/docker-compose-generator/docker-fragments/opt-add-joinmarket.yml b/docker-compose-generator/docker-fragments/opt-add-joinmarket.yml index c7b9080..444f664 100644 --- a/docker-compose-generator/docker-fragments/opt-add-joinmarket.yml +++ b/docker-compose-generator/docker-fragments/opt-add-joinmarket.yml @@ -3,8 +3,8 @@ version: "3" services: joinmarket: container_name: joinmarket - image: btcpayserver/joinmarket:0.9.1 - restart: 'no' + image: btcpayserver/joinmarket:0.9.3-devbtcpay + restart: unless-stopped environment: READY_FILE: /root/.nbxplorer/btc_fully_synched ENSURE_WALLET: 1 @@ -25,7 +25,8 @@ services: - "nbxplorer_datadir:/root/.nbxplorer" - "tor_datadir:/home/tor/.tor" expose: - - 62601 + - 62601 # obwatch + - 8080 # payjoin server links: - bitcoind diff --git a/jm.sh b/jm.sh index a7a1fa9..eb7019a 100755 --- a/jm.sh +++ b/jm.sh @@ -13,6 +13,7 @@ Tooling to setup your joinmarket yield generator bash: Open an interactive bash session in the joinmarket container receive-payjoin: Receive a payjoin payment sendpayment: Send a payjoin through coinjoin (password needed) + reset-config: Reset the configuration to its default value Example: * jm.sh wallet-tool-generate @@ -21,6 +22,7 @@ Example: * jm.sh receive-payjoin * jm.sh sendpayment
* jm.sh wallet-tool history + * jm.sh reset-config * jm.sh bash See https://github.com/btcpayserver/btcpayserver-docker/tree/master/docs/joinmarket.md for more information. @@ -34,6 +36,11 @@ while (( "$#" )); do shift 1 break; ;; + reset-config) + CMD="$1" + shift 1 + break; + ;; wallet-tool) CMD="$1" shift 1 @@ -89,7 +96,10 @@ else elif [[ "$CMD" == "set-wallet" ]]; then docker exec joinmarket set-wallet.sh "$@" docker restart joinmarket - elif [[ "$CMD" == "bash" ]]; then + elif [[ "$CMD" == "reset-config" ]]; then + docker exec -ti joinmarket bash -c 'rm -f "$CONFIG"' + docker restart joinmarket + elif [[ "$CMD" == "bash" ]]; then docker exec -ti joinmarket exec-wrapper.sh bash "$@" else display_help From ec8359199e52148e385b6bcbc4b2ada22ee27680 Mon Sep 17 00:00:00 2001 From: d11n Date: Wed, 20 Oct 2021 09:47:47 +0200 Subject: [PATCH 2/2] Upgrade Tallycoin Connect (#541) Now it also supports arm32v7 and arm64v8 architectures. --- README.md | 2 +- contrib/build-all-images.sh | 14 ++++++-------- .../docker-fragments/opt-add-tallycoin-connect.yml | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 3198316..dc8eaed 100644 --- a/README.md +++ b/README.md @@ -382,7 +382,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | jvandrew/librepatron | 0.7.39 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/patron/v0.7.39/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/patron) - [DockerHub](https://hub.docker.com/r/jvandrew/librepatron) | | jvandrew/isso | atron.22 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/isso/patron.22/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/isso) - [DockerHub](https://hub.docker.com/r/jvandrew/isso) | | sphinxlightning/sphinx-relay | v2.2.0 | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.0/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.0/Dockerfile) | [Github](https://github.com/stakwork/sphinx-relay) - [DockerHub](https://hub.docker.com/r/sphinxlightning/sphinx-relay) | -| dennisreimann/tallycoin_connect | v1.4.0 | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.4.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/dennisreimann/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/dennisreimann/tallycoin_connect) | +| djbooth007/tallycoin_connect | v1.7.0 | [✔️](https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.7.0/Dockerfile) | ️[✔️](https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.7.0/Dockerfile.arm32v7) | ️[✔️](https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.7.0/Dockerfile.arm64v8) | [Github](https://github.com/djbooth007/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/dennisreimann/tallycoin_connect) | | talaia/python-teos | latest | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm64v8.Dockerfile) | [Github](https://github.com/talaia-labs/python-teos) - [DockerHub](https://hub.docker.com/r/talaia/python-teos) | | apotdevin/thunderhub | base-v0.12.17 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/arm64v8.Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) | | btcpayserver/docker-woocommerce | 3.0.14 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.14/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/docker-woocommerce) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-woocommerce) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 2847c51..0c4fc6a 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -719,7 +719,7 @@ DOCKERFILE="Dockerfile" echo "Building fireflyiii/core:latest" git clone https://dev.azure.com/Firefly-III/_git/MainImage core cd core -git checkout +git checkout cd "$(dirname $DOCKERFILE)" docker build -f "$DOCKERFILE" -t "fireflyiii/core:latest" . cd - && cd .. @@ -812,14 +812,14 @@ cd - && cd .. # Build tallycoin_connect -# https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.4.0/Dockerfile +# https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.7.0/Dockerfile DOCKERFILE="Dockerfile" -echo "Building dennisreimann/tallycoin_connect:v1.4.0" -git clone https://github.com/dennisreimann/tallycoin_connect tallycoin_connect +echo "Building djbooth007/tallycoin_connect:v1.7.0" +git clone https://github.com/djbooth007/tallycoin_connect tallycoin_connect cd tallycoin_connect -git checkout v1.4.0 +git checkout v1.7.0 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "dennisreimann/tallycoin_connect:v1.4.0" . +docker build -f "$DOCKERFILE" -t "djbooth007/tallycoin_connect:v1.7.0" . cd - && cd .. @@ -1089,5 +1089,3 @@ git checkout master cd "$(dirname $DOCKERFILE)" docker build -f "$DOCKERFILE" -t "romanornr/docker-viacoin:0.15.2" . cd - && cd .. - - diff --git a/docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml b/docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml index 1d08341..bf0fead 100644 --- a/docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml +++ b/docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml @@ -6,7 +6,7 @@ services: volumes: - "tallycoin_connect_datadir:/etc/tallycoin_connect_datadir" tallycoin_connect: - image: "dennisreimann/tallycoin_connect:v1.4.0" + image: "dennisreimann/tallycoin_connect:v1.7.0" restart: unless-stopped expose: - "8123"