diff --git a/README.md b/README.md index 9bd8730..7899836 100644 --- a/README.md +++ b/README.md @@ -327,7 +327,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | bitcoin-clightning.yml | shesek/spark-wallet | 0.2.4-standalone | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.4/Dockerfile) | ️❌ | [Github](https://github.com/shesek/spark-wallet) - [DockerHub](https://hub.docker.com/r/shesek/spark-wallet) | | bitcoin-lnd.yml | btcpayserver/lnd | v0.6.1-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.6.1-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.6.1-beta/linuxarm32v7.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.106 | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.106/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.106/Dockerfile.linuxarm32v7) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | +| btcpayserver.yml | btcpayserver/btcpayserver | 1.0.3.108 | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.108/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.108/arm32v7.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | | dash.yml | btcpayserver/dash | 0.13.0 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.13.0/Dash/0.13.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.13.0/Dash/0.13.0/linuxarm32v7.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/dash) | | dogecoin.yml | rockstardev/dogecoin | 1.10.0 | [✔️](https://raw.githubusercontent.com/rockstardev/docker-bitcoin/feature/dogecoin/dogecoin/1.10.0/Dockerfile) | ️❌ | [Github](https://github.com/rockstardev/docker-bitcoin) - [DockerHub](https://hub.docker.com/r/rockstardev/dogecoin) | | feathercoin.yml | chekaz/docker-feathercoin | 0.16.3 | [✔️](https://raw.githubusercontent.com/ChekaZ/docker/master/feathercoin/0.16.3/Dockerfile) | ️❌ | [Github](https://github.com/ChekaZ/docker) - [DockerHub](https://hub.docker.com/r/chekaz/docker-feathercoin) | diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index d3ef0e2..d0d1c08 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -340,8 +340,8 @@ namespace DockerFileBuildHelper dockerInfo.GitRef = $"Dash/{image.Tag}"; break; case "btcpayserver": - dockerInfo.DockerFilePath = "Dockerfile.linuxamd64"; - dockerInfo.DockerFilePathARM32v7 = "Dockerfile.linuxarm32v7"; + dockerInfo.DockerFilePath = "amd64.Dockerfile"; + dockerInfo.DockerFilePathARM32v7 = "arm32v7.Dockerfile"; dockerInfo.GitLink = "https://github.com/btcpayserver/btcpayserver"; dockerInfo.GitRef = $"v{image.Tag}"; break; diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index f63527e..fd29e0f 100755 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -165,16 +165,16 @@ cd - && cd .. # Build btcpayserver -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.106/Dockerfile.linuxamd64 -DOCKERFILE="Dockerfile.linuxamd64" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.106/Dockerfile.linuxarm32v7 -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.linuxarm32v7" -echo "Building btcpayserver/btcpayserver:1.0.3.106" +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.108/amd64.Dockerfile +DOCKERFILE="amd64.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.108/arm32v7.Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" +echo "Building btcpayserver/btcpayserver:1.0.3.108" git clone https://github.com/btcpayserver/btcpayserver btcpayserver cd btcpayserver -git checkout v1.0.3.106 +git checkout v1.0.3.108 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.0.3.106" . +docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.0.3.108" . cd - && cd ..