From 650de8f647d641f5a2981f478a4cb78a2ec4e78f Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Wed, 20 Oct 2021 16:48:59 +0900 Subject: [PATCH] update doc --- README.md | 4 ++-- contrib/build-all-images.sh | 30 ++++++++++++++++-------------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index dc8eaed..10c36f7 100644 --- a/README.md +++ b/README.md @@ -349,7 +349,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | btcpayserver/btctransmuter | 0.0.57 | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.57/Dockerfiles/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.57/Dockerfiles/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.57/Dockerfiles/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btctransmuter) - [DockerHub](https://hub.docker.com/r/btcpayserver/btctransmuter) | | btcpayserver/btcpayserver-configurator | 0.0.21 | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver-configurator) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver-configurator) | | btcpayserver/eps | 0.2.1.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/eps) | -| btcpayserver/joinmarket | 0.9.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.1/JoinMarket/0.9.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.1/JoinMarket/0.9.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.1/JoinMarket/0.9.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/joinmarket) | +| btcpayserver/joinmarket | 0.9.3-devbtcpay | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.3-devbtcpay/JoinMarket/0.9.3/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.3-devbtcpay/JoinMarket/0.9.3/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.3-devbtcpay/JoinMarket/0.9.3/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/joinmarket) | | nicolasdorier/ndlc-cli | 1.0.1 | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm64v8.Dockerfile) | [Github](https://github.com/dgarage/ndlc) - [DockerHub](https://hub.docker.com/r/nicolasdorier/ndlc-cli) | | pihole/pihole | v5.7 | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [Github](https://github.com/pi-hole/docker-pi-hole) - [DockerHub](https://hub.docker.com/r/pihole/pihole) | | btcpayserver/tor | 0.4.5.9 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.5.9/Tor/0.4.5.9/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.5.9/Tor/0.4.5.9/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.5.9/Tor/0.4.5.9/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/tor) | @@ -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) | -| 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) | +| dennisreimann/tallycoin_connect | v1.7.0 | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/dennisreimann/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 0c4fc6a..796bf0d 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -719,25 +719,25 @@ 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 .. # Build joinmarket -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.1/JoinMarket/0.9.1/linuxamd64.Dockerfile -DOCKERFILE="JoinMarket/0.9.1/linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.1/JoinMarket/0.9.1/linuxarm32v7.Dockerfile -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="JoinMarket/0.9.1/linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.1/JoinMarket/0.9.1/linuxarm64v8.Dockerfile -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="JoinMarket/0.9.1/linuxarm64v8.Dockerfile" -echo "Building btcpayserver/joinmarket:0.9.1" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.3-devbtcpay/JoinMarket/0.9.3/linuxamd64.Dockerfile +DOCKERFILE="JoinMarket/0.9.3/linuxamd64.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.3-devbtcpay/JoinMarket/0.9.3/linuxarm32v7.Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="JoinMarket/0.9.3/linuxarm32v7.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.3-devbtcpay/JoinMarket/0.9.3/linuxarm64v8.Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="JoinMarket/0.9.3/linuxarm64v8.Dockerfile" +echo "Building btcpayserver/joinmarket:0.9.3-devbtcpay" git clone https://github.com/btcpayserver/dockerfile-deps joinmarket cd joinmarket -git checkout JoinMarket/0.9.1 +git checkout JoinMarket/0.9.3-devbtcpay cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/joinmarket:0.9.1" . +docker build -f "$DOCKERFILE" -t "btcpayserver/joinmarket:0.9.3-devbtcpay" . cd - && cd .. @@ -812,14 +812,14 @@ cd - && cd .. # Build tallycoin_connect -# https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.7.0/Dockerfile +# https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile DOCKERFILE="Dockerfile" -echo "Building djbooth007/tallycoin_connect:v1.7.0" -git clone https://github.com/djbooth007/tallycoin_connect tallycoin_connect +echo "Building dennisreimann/tallycoin_connect:v1.7.0" +git clone https://github.com/dennisreimann/tallycoin_connect tallycoin_connect cd tallycoin_connect git checkout v1.7.0 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "djbooth007/tallycoin_connect:v1.7.0" . +docker build -f "$DOCKERFILE" -t "dennisreimann/tallycoin_connect:v1.7.0" . cd - && cd .. @@ -1089,3 +1089,5 @@ git checkout master cd "$(dirname $DOCKERFILE)" docker build -f "$DOCKERFILE" -t "romanornr/docker-viacoin:0.15.2" . cd - && cd .. + +