diff --git a/README.md b/README.md index e5dccb9..165462a 100644 --- a/README.md +++ b/README.md @@ -358,7 +358,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | btcpayserver/postgres | 13.4-4 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4-4/Postgres/13.4/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4-4/Postgres/13.4/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4-4/Postgres/13.4/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/postgres) | | kamigawabul/docker-bitcoingold | 0.15.2 | [✔️](https://raw.githubusercontent.com/Vutov/docker-bitcoin/master/bitcoingold/0.15.2/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Vutov/docker-bitcoin) - [DockerHub](https://hub.docker.com/r/kamigawabul/docker-bitcoingold) | | kamigawabul/btglnd | latest | [✔️](https://raw.githubusercontent.com/vutov/lnd/master/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/vutov/lnd) - [DockerHub](https://hub.docker.com/r/kamigawabul/btglnd) | -| acinq/eclair | release-0.4.1 | [✔️](https://raw.githubusercontent.com/ACINQ/eclair/v0.4.1/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/ACINQ/eclair) - [DockerHub](https://hub.docker.com/r/acinq/eclair) | +| acinq/eclair | release-0.6.1 | [✔️](https://raw.githubusercontent.com/ACINQ/eclair/v0.6.1/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/ACINQ/eclair) - [DockerHub](https://hub.docker.com/r/acinq/eclair) | | chekaz/docker-bitcoinplus | 2.7.0 | [✔️](https://raw.githubusercontent.com/ChekaZ/docker/master/bitcoinplus/2.7.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/ChekaZ/docker) - [DockerHub](https://hub.docker.com/r/chekaz/docker-bitcoinplus) | | dalijolijo/docker-bitcore | 0.90.9.10 | [✔️](https://raw.githubusercontent.com/dalijolijo/btcpayserver-docker-bitcore/master/docker-bitcored/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/dalijolijo/btcpayserver-docker-bitcore) - [DockerHub](https://hub.docker.com/r/dalijolijo/docker-bitcore) | | btcpayserver/dash | 0.17.0.3 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.17.0.3/Dash/0.17.0.3/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.17.0.3/Dash/0.17.0.3/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.17.0.3/Dash/0.17.0.3/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/dash) | @@ -378,9 +378,10 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | bluewalletorganization/lndhub | v1.3.3 | [✔️](https://raw.githubusercontent.com/BlueWallet/LndHub/v1.3.3/Dockerfile) | [✔️](https://raw.githubusercontent.com/BlueWallet/LndHub/v1.3.3/Dockerfile) | ️❌ | [Github](https://github.com/BlueWallet/LndHub) - [DockerHub](https://hub.docker.com/r/bluewalletorganization/lndhub) | | jvandrew/btcqbo | 0.3.36 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/btcqbo/v0.3.36/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/btcqbo) - [DockerHub](https://hub.docker.com/r/jvandrew/btcqbo) | | shesek/bwt | 0.2.2-electrum | [✔️](https://raw.githubusercontent.com/bwt-dev/bwt/v0.2.2/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/bwt-dev/bwt/v0.2.2/docker/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/bwt-dev/bwt/v0.2.2/docker/arm64v8.Dockerfile) | [Github](https://github.com/bwt-dev/bwt) - [DockerHub](https://hub.docker.com/r/shesek/bwt) | -| chatwoot/chatwoot | v1.7.0 | [✔️](https://raw.githubusercontent.com/chatwoot/chatwoot/v1.7.0/docker/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/chatwoot/chatwoot) - [DockerHub](https://hub.docker.com/r/chatwoot/chatwoot) | +| chatwoot/chatwoot | v1.7.0 | [✔️](https://raw.githubusercontent.com/chatwoot/chatwoot/v1.7.0/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/chatwoot/chatwoot/v1.7.0/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/chatwoot/chatwoot/v1.7.0/docker/Dockerfile) | [Github](https://github.com/chatwoot/chatwoot) - [DockerHub](https://hub.docker.com/r/chatwoot/chatwoot) | | lukechilds/electrumx | latest | [✔️](https://raw.githubusercontent.com/lukechilds/docker-electrumx/master/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/lukechilds/docker-electrumx) - [DockerHub](https://hub.docker.com/r/lukechilds/electrumx) | | fireflyiii/core | latest | [✔️](https://dev.azure.com/Firefly-III/66fb773b-063e-42d7-b6a5-e7729a22e8b3/_apis/git/repositories/e9c3dcf8-4533-4ef1-83cc-75527cab3377/items?path=%2FDockerfile&versionDescriptor%5BversionOptions%5D=0&versionDescriptor%5BversionType%5D=0&versionDescriptor%5Bversion%5D=main&resolveLfs=true&%24format=octetStream&api-version=5.0&download=true) | [✔️](https://dev.azure.com/Firefly-III/66fb773b-063e-42d7-b6a5-e7729a22e8b3/_apis/git/repositories/e9c3dcf8-4533-4ef1-83cc-75527cab3377/items?path=%2FDockerfile&versionDescriptor%5BversionOptions%5D=0&versionDescriptor%5BversionType%5D=0&versionDescriptor%5Bversion%5D=main&resolveLfs=true&%24format=octetStream&api-version=5.0&download=true) | [✔️](https://dev.azure.com/Firefly-III/66fb773b-063e-42d7-b6a5-e7729a22e8b3/_apis/git/repositories/e9c3dcf8-4533-4ef1-83cc-75527cab3377/items?path=%2FDockerfile&versionDescriptor%5BversionOptions%5D=0&versionDescriptor%5BversionType%5D=0&versionDescriptor%5Bversion%5D=main&resolveLfs=true&%24format=octetStream&api-version=5.0&download=true) | [Github](https://dev.azure.com/Firefly-III/_git/MainImage) - [DockerHub](https://hub.docker.com/r/fireflyiii/core) | +| podcastindexorg/podcasting20-helipad | v0.1.6 | [✔️](https://raw.githubusercontent.com/Podcastindex-org/helipad/v0.1.6/umbrel/Dockerfile) | [✔️](https://raw.githubusercontent.com/Podcastindex-org/helipad/v0.1.6/umbrel/Dockerfile) | [✔️](https://raw.githubusercontent.com/Podcastindex-org/helipad/v0.1.6/umbrel/Dockerfile) | [Github](https://github.com/Podcastindex-org/helipad) - [DockerHub](https://hub.docker.com/r/podcastindexorg/podcasting20-helipad) | | 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) | | lightninglabs/lightning-terminal | v0.6.1-alpha-path-prefix | [✔️](https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.6.1-alpha/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/lightninglabs/lightning-terminal) - [DockerHub](https://hub.docker.com/r/lightninglabs/lightning-terminal) | diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index 37f0900..6e04835 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -680,7 +680,7 @@ namespace DockerFileBuildHelper dockerInfo.GitLink = "https://github.com/chatwoot/chatwoot"; dockerInfo.GitRef = $"{image.Tag}"; break; - case "podcastindexorg/podcasting20-boosts": + case "podcastindexorg/podcasting20-helipad": dockerInfo.DockerFilePath = $"umbrel/Dockerfile"; dockerInfo.DockerFilePathARM32v7 = $"umbrel/Dockerfile"; dockerInfo.DockerFilePathARM64v8 = $"umbrel/Dockerfile"; diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index e45531f..63f818b 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -142,14 +142,14 @@ cd - && cd .. # Build eclair -# https://raw.githubusercontent.com/ACINQ/eclair/v0.4.1/Dockerfile +# https://raw.githubusercontent.com/ACINQ/eclair/v0.6.1/Dockerfile DOCKERFILE="Dockerfile" -echo "Building acinq/eclair:release-0.4.1" +echo "Building acinq/eclair:release-0.6.1" git clone https://github.com/ACINQ/eclair eclair cd eclair -git checkout v0.4.1 +git checkout v0.6.1 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "acinq/eclair:release-0.4.1" . +docker build -f "$DOCKERFILE" -t "acinq/eclair:release-0.6.1" . cd - && cd .. @@ -634,6 +634,10 @@ cd - && cd .. # Build chatwoot # https://raw.githubusercontent.com/chatwoot/chatwoot/v1.7.0/docker/Dockerfile DOCKERFILE="docker/Dockerfile" +# https://raw.githubusercontent.com/chatwoot/chatwoot/v1.7.0/docker/Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="docker/Dockerfile" +# https://raw.githubusercontent.com/chatwoot/chatwoot/v1.7.0/docker/Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="docker/Dockerfile" echo "Building chatwoot/chatwoot:v1.7.0" git clone https://github.com/chatwoot/chatwoot chatwoot cd chatwoot @@ -646,6 +650,10 @@ cd - && cd .. # Build chatwoot # https://raw.githubusercontent.com/chatwoot/chatwoot/v1.7.0/docker/Dockerfile DOCKERFILE="docker/Dockerfile" +# https://raw.githubusercontent.com/chatwoot/chatwoot/v1.7.0/docker/Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="docker/Dockerfile" +# https://raw.githubusercontent.com/chatwoot/chatwoot/v1.7.0/docker/Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="docker/Dockerfile" echo "Building chatwoot/chatwoot:v1.7.0" git clone https://github.com/chatwoot/chatwoot chatwoot cd chatwoot @@ -727,6 +735,22 @@ docker build -f "$DOCKERFILE" -t "fireflyiii/core:latest" . cd - && cd .. +# Build podcasting20-helipad +# https://raw.githubusercontent.com/Podcastindex-org/helipad/v0.1.6/umbrel/Dockerfile +DOCKERFILE="umbrel/Dockerfile" +# https://raw.githubusercontent.com/Podcastindex-org/helipad/v0.1.6/umbrel/Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="umbrel/Dockerfile" +# https://raw.githubusercontent.com/Podcastindex-org/helipad/v0.1.6/umbrel/Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="umbrel/Dockerfile" +echo "Building podcastindexorg/podcasting20-helipad:v0.1.6" +git clone https://github.com/Podcastindex-org/helipad podcasting20-helipad +cd podcasting20-helipad +git checkout v0.1.6 +cd "$(dirname $DOCKERFILE)" +docker build -f "$DOCKERFILE" -t "podcastindexorg/podcasting20-helipad:v0.1.6" . +cd - && cd .. + + # Build joinmarket # https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.3/JoinMarket/0.9.3/linuxamd64.Dockerfile DOCKERFILE="JoinMarket/0.9.3/linuxamd64.Dockerfile" diff --git a/docker-compose-generator/docker-fragments/bitcoin-eclair.yml b/docker-compose-generator/docker-fragments/bitcoin-eclair.yml index 356be09..ec02317 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-eclair.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-eclair.yml @@ -9,11 +9,10 @@ services: container_name: btcpayserver_eclair_bitcoin restart: unless-stopped stop_signal: SIGINT - image: acinq/eclair:release-0.4.1 + image: acinq/eclair:release-0.6.1 environment: PUBLIC_HOST: ${BTCPAY_HOST} JAVA_OPTS: | - -Xmx256m -Declair.printToConsole -Declair.headless -Declair.chain=${NBITCOIN_NETWORK:-regtest}