diff --git a/README.md b/README.md index b00eb52..2b2fa42 100644 --- a/README.md +++ b/README.md @@ -324,7 +324,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | btcpayserver/lightning | v0.9.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.9.1/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.9.1/contrib/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.9.1/contrib/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lightning) - [DockerHub](https://hub.docker.com/r/btcpayserver/lightning) | | shesek/lightning-charge | 0.4.19-standalone | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.19/Dockerfile) | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.19/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.19/arm64v8.Dockerfile) | [Github](https://github.com/ElementsProject/lightning-charge) - [DockerHub](https://hub.docker.com/r/shesek/lightning-charge) | | 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) | -| saubyk/c-lightning-rest | 0.3.0 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.3.0/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.3.0/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.3.0/arm64v8.Dockerfile) | [Github](https://github.com/Ride-The-Lightning/c-lightning-REST) - [DockerHub](https://hub.docker.com/r/saubyk/c-lightning-rest) | +| saubyk/c-lightning-rest | 0.4.3 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.3/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.3/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.3/arm64v8.Dockerfile) | [Github](https://github.com/Ride-The-Lightning/c-lightning-REST) - [DockerHub](https://hub.docker.com/r/saubyk/c-lightning-rest) | | shahanafarooqui/rtl | 0.9.3 | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.9.3/Dockerfile) | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.9.3/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.9.3/Dockerfile.arm64v8) | [Github](https://github.com/ShahanaFarooqui/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | | btcpayserver/lnd | v0.11.0-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.11.0-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.11.0-beta/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.11.0-beta/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/btcpayserver | 1.0.6.4$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.6.4/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.6.4/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.6.4/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | @@ -334,7 +334,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | btcpayserver/letsencrypt-nginx-proxy-companion | 1.12.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion) - [DockerHub](https://hub.docker.com/r/btcpayserver/letsencrypt-nginx-proxy-companion) | | btcpayserver/btctransmuter | 0.0.55 | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.55/Dockerfiles/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.55/Dockerfiles/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.55/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.0 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.0/EPS/0.2.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.0/EPS/0.2.0/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.0/EPS/0.2.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/eps) | +| 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) | | 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.0 | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.0/Dockerfile_amd64) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.0/Dockerfile_armhf) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.0/Dockerfile_arm64) | [Github](https://github.com/pi-hole/docker-pi-hole) - [DockerHub](https://hub.docker.com/r/pihole/pihole) | | btcpayserver/tor | 0.4.2.7 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.2.7/Tor/0.4.2.7/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.2.7/Tor/0.4.2.7/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.2.7/Tor/0.4.2.7/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/tor) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index ae5deac..8ee318b 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -110,34 +110,34 @@ cd - && cd .. # Build c-lightning-rest -# https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.3.0/amd64.Dockerfile +# https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.3/amd64.Dockerfile DOCKERFILE="amd64.Dockerfile" -# https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.3.0/arm32v7.Dockerfile +# https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.3/arm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" -# https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.3.0/arm64v8.Dockerfile +# https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.3/arm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" -echo "Building saubyk/c-lightning-rest:0.3.0" +echo "Building saubyk/c-lightning-rest:0.4.3" git clone https://github.com/Ride-The-Lightning/c-lightning-REST c-lightning-rest cd c-lightning-rest -git checkout v0.3.0 +git checkout v0.4.3 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "saubyk/c-lightning-rest:0.3.0" . +docker build -f "$DOCKERFILE" -t "saubyk/c-lightning-rest:0.4.3" . cd - && cd .. # Build rtl -# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.9.2/Dockerfile +# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.9.3/Dockerfile DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.9.2/Dockerfile.arm32v7 +# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.9.3/Dockerfile.arm32v7 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.arm32v7" -# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.9.2/Dockerfile.arm64v8 +# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.9.3/Dockerfile.arm64v8 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.arm64v8" -echo "Building shahanafarooqui/rtl:0.9.2" +echo "Building shahanafarooqui/rtl:0.9.3" git clone https://github.com/ShahanaFarooqui/RTL rtl cd rtl -git checkout v0.9.2 +git checkout v0.9.3 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.9.2" . +docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.9.3" . cd - && cd .. @@ -153,6 +153,22 @@ docker build -f "$DOCKERFILE" -t "acinq/eclair:release-0.4.1" . cd - && cd .. +# Build rtl +# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.8.2/Dockerfile +DOCKERFILE="Dockerfile" +# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.8.2/Dockerfile.arm32v7 +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.arm32v7" +# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.8.2/Dockerfile.arm64v8 +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.arm64v8" +echo "Building shahanafarooqui/rtl:0.8.2" +git clone https://github.com/ShahanaFarooqui/RTL rtl +cd rtl +git checkout v0.8.2 +cd "$(dirname $DOCKERFILE)" +docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.8.2" . +cd - && cd .. + + # Build lnd # https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.11.0-beta/linuxamd64.Dockerfile DOCKERFILE="linuxamd64.Dockerfile" @@ -169,6 +185,22 @@ docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:v0.11.0-beta" . cd - && cd .. +# Build rtl +# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.9.3/Dockerfile +DOCKERFILE="Dockerfile" +# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.9.3/Dockerfile.arm32v7 +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.arm32v7" +# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.9.3/Dockerfile.arm64v8 +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.arm64v8" +echo "Building shahanafarooqui/rtl:0.9.3" +git clone https://github.com/ShahanaFarooqui/RTL rtl +cd rtl +git checkout v0.9.3 +cd "$(dirname $DOCKERFILE)" +docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.9.3" . +cd - && cd .. + + # Build bitcoin # https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.20.1/Bitcoin/0.20.1/linuxamd64.Dockerfile DOCKERFILE="Bitcoin/0.20.1/linuxamd64.Dockerfile" @@ -556,18 +588,18 @@ cd - && cd .. # Build eps -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.0/EPS/0.2.0/linuxamd64.Dockerfile -DOCKERFILE="EPS/0.2.0/linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.0/EPS/0.2.0/linuxarm32v7.Dockerfile -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="EPS/0.2.0/linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.0/EPS/0.2.0/linuxarm64v8.Dockerfile -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="EPS/0.2.0/linuxarm64v8.Dockerfile" -echo "Building btcpayserver/eps:0.2.0" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxamd64.Dockerfile +DOCKERFILE="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 +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="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 +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="EPS/0.2.1.1/linuxarm64v8.Dockerfile" +echo "Building btcpayserver/eps:0.2.1.1" git clone https://github.com/btcpayserver/dockerfile-deps eps cd eps -git checkout EPS/0.2.0 +git checkout EPS/0.2.1.1 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/eps:0.2.0" . +docker build -f "$DOCKERFILE" -t "btcpayserver/eps:0.2.1.1" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/opt-add-electrum-ps.yml b/docker-compose-generator/docker-fragments/opt-add-electrum-ps.yml index ed2e928..5758efd 100644 --- a/docker-compose-generator/docker-fragments/opt-add-electrum-ps.yml +++ b/docker-compose-generator/docker-fragments/opt-add-electrum-ps.yml @@ -6,7 +6,7 @@ services: BITCOIN_EXTRA_ARGS: | rpcauth=eps:3d1cff5ee81ddeb3ba94483150310e74$$4626aeb95b2a2b066eac8833c1ad936f65cf7492aa836ec8f173ff65ac428a0e electrum_ps: - image: btcpayserver/eps:0.2.0 + image: btcpayserver/eps:0.2.1.1 restart: unless-stopped ports: - "50002:50002"