diff --git a/README.md b/README.md index 42601fe..d89fa42 100644 --- a/README.md +++ b/README.md @@ -306,7 +306,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | bitcoin.yml | btcpayserver/bitcoin | 0.18.0 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.18.0/Bitcoin/0.18.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.18.0/Bitcoin/0.18.0/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.18.0/Bitcoin/0.18.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcoin) | | bitcoin-clightning.yml | btcpayserver/lightning | v0.7.2-1 | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.7.2-1/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.7.2-1/contrib/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.7.2-1/contrib/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lightning) - [DockerHub](https://hub.docker.com/r/btcpayserver/lightning) | | bitcoin-clightning.yml | shesek/lightning-charge | 0.4.6-standalone | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.6/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/ElementsProject/lightning-charge) - [DockerHub](https://hub.docker.com/r/shesek/lightning-charge) | -| bitcoin-clightning.yml | shesek/spark-wallet | 0.2.8-standalone | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.8/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/shesek/spark-wallet) - [DockerHub](https://hub.docker.com/r/shesek/spark-wallet) | +| bitcoin-clightning.yml | shesek/spark-wallet | 0.2.9-standalone | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm64v8.Dockerfile) | [Github](https://github.com/shesek/spark-wallet) - [DockerHub](https://hub.docker.com/r/shesek/spark-wallet) | | bitcoin-lnd.yml | btcpayserver/lnd | v0.7.1-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.7.1-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.7.1-beta/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.7.1-beta/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | bitcore.yml | dalijolijo/docker-bitcore | 0.15.2 | [✔️](https://raw.githubusercontent.com/dalijolijo/btcpayserver-docker-bitcore/master/btx-debian/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/dalijolijo/btcpayserver-docker-bitcore) - [DockerHub](https://hub.docker.com/r/dalijolijo/docker-bitcore) | | btcpayserver.yml | btcpayserver/btcpayserver | 1.0.3.133 | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.133/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.133/arm32v7.Dockerfile) | ️❌ | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index 37c4f98..c4a83e9 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -465,6 +465,8 @@ namespace DockerFileBuildHelper break; case "spark-wallet": dockerInfo.DockerFilePath = $"Dockerfile"; + dockerInfo.DockerFilePathARM32v7 = $"arm32v7.Dockerfile"; + dockerInfo.DockerFilePathARM64v8 = $"arm64v8.Dockerfile"; dockerInfo.GitLink = "https://github.com/shesek/spark-wallet"; dockerInfo.GitRef = $"v{image.Tag.Split('-')[0]}"; break; diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 19329b4..0c140e2 100755 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -90,14 +90,18 @@ cd - && cd .. # Build spark-wallet -# https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.8/Dockerfile +# https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/Dockerfile DOCKERFILE="Dockerfile" -echo "Building shesek/spark-wallet:0.2.8-standalone" +# https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm32v7.Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" +# https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm64v8.Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" +echo "Building shesek/spark-wallet:0.2.9-standalone" git clone https://github.com/shesek/spark-wallet spark-wallet cd spark-wallet -git checkout v0.2.8 +git checkout v0.2.9 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "shesek/spark-wallet:0.2.8-standalone" . +docker build -f "$DOCKERFILE" -t "shesek/spark-wallet:0.2.9-standalone" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml index 2e752b5..1e9ade0 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml @@ -38,7 +38,7 @@ services: links: - clightning_bitcoin clightning_bitcoin_spark: - image: shesek/spark-wallet:0.2.8-standalone + image: shesek/spark-wallet:0.2.9-standalone restart: unless-stopped environment: NETWORK: ${NBITCOIN_NETWORK:-regtest}