From 62192cd9ffb4fd72af365cfb70711f2a8beb6199 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Wed, 16 Feb 2022 11:44:51 +0900 Subject: [PATCH] Bump eclair --- README.md | 4 ++-- contrib/DockerFileBuildHelper/Program.cs | 10 ++++---- contrib/build-all-images.sh | 24 ++++++++++--------- .../docker-fragments/bitcoin-eclair.yml | 2 +- 4 files changed, 22 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index bd9877d..995eba7 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/btglnd | latest | [✔️](https://raw.githubusercontent.com/vutov/lnd/master/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/vutov/lnd) - [DockerHub](https://hub.docker.com/r/kamigawabul/btglnd) | | 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) | -| 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) | +| acinq/eclair | release-0.7.0 | [✔️](https://raw.githubusercontent.com/ACINQ/eclair/v0.7.0/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) | @@ -389,7 +389,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | 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) | | dennisreimann/tallycoin_connect | v1.7.0 | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile) | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile.arm64v8) | [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.13.1 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.13.1/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.13.1/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.13.1/arm64v8.Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) | +| apotdevin/thunderhub | base-v0.13.6 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.13.6/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.13.6/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.13.6/arm64v8.Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) | | btcpayserver/docker-woocommerce | 3.0.15 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.15/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/docker-woocommerce) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-woocommerce) | | mariadb | 10.3 | [✔️](https://raw.githubusercontent.com/docker-library/mariadb/master/10.3/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/docker-library/mariadb) - [DockerHub](https://hub.docker.com/_/mariadb) | | zammad/zammad-docker-compose | zammad-postgresql-3.4.0-4 | [✔️](https://raw.githubusercontent.com/zammad/zammad-docker-compose/master/containers/zammad-postgresql/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/zammad/zammad-docker-compose) - [DockerHub](https://hub.docker.com/r/zammad/zammad-docker-compose) | diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index 378a28f..8b5cda7 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -496,10 +496,12 @@ namespace DockerFileBuildHelper dockerInfo.GitLink = "https://github.com/ChekaZ/docker"; dockerInfo.GitRef = "master"; break; - case "docker-groestlcoin": - dockerInfo.DockerFilePath = $"groestlcoin/{image.Tag}/Dockerfile"; - dockerInfo.GitLink = "https://github.com/Groestlcoin/docker-groestlcoin"; - dockerInfo.GitRef = "master"; + case "btcpayserver/groestlcoin": + dockerInfo.DockerFilePath = $"Groestlcoin/{NoRevision(image.Tag)}/linuxamd64.Dockerfile"; + dockerInfo.DockerFilePathARM32v7 = $"Groestlcoin/{NoRevision(image.Tag)}/linuxarm32v7.Dockerfile"; + dockerInfo.DockerFilePathARM64v8 = $"Groestlcoin/{NoRevision(image.Tag)}/linuxarm64v8.Dockerfile"; + dockerInfo.GitLink = "https://github.com/btcpayserver/dockerfile-deps"; + dockerInfo.GitRef = $"Groestlcoin/{NoRevision(image.Tag)}"; break; case "docker-viacoin": dockerInfo.DockerFilePath = $"viacoin/{image.Tag}/docker-viacoin"; diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 2278bd6..958c201 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.6.1/Dockerfile +# https://raw.githubusercontent.com/ACINQ/eclair/v0.7.0/Dockerfile DOCKERFILE="Dockerfile" -echo "Building acinq/eclair:release-0.6.1" +echo "Building acinq/eclair:release-0.7.0" git clone https://github.com/ACINQ/eclair eclair cd eclair -git checkout v0.6.1 +git checkout v0.7.0 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "acinq/eclair:release-0.6.1" . +docker build -f "$DOCKERFILE" -t "acinq/eclair:release-0.7.0" . cd - && cd .. @@ -717,7 +717,7 @@ 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 .. @@ -886,18 +886,18 @@ cd - && cd .. # Build thunderhub -# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.13.1/Dockerfile +# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.13.6/Dockerfile DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.13.1/arm32v7.Dockerfile +# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.13.6/arm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" -# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.13.1/arm64v8.Dockerfile +# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.13.6/arm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" -echo "Building apotdevin/thunderhub:base-v0.13.1" +echo "Building apotdevin/thunderhub:base-v0.13.6" git clone https://github.com/apotdevin/thunderhub thunderhub cd thunderhub -git checkout v0.13.1 +git checkout v0.13.6 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "apotdevin/thunderhub:base-v0.13.1" . +docker build -f "$DOCKERFILE" -t "apotdevin/thunderhub:base-v0.13.6" . cd - && cd .. @@ -1135,3 +1135,5 @@ git checkout master cd "$(dirname $DOCKERFILE)" docker build -f "$DOCKERFILE" -t "romanornr/docker-viacoin:0.15.2" . cd - && cd .. + + diff --git a/docker-compose-generator/docker-fragments/bitcoin-eclair.yml b/docker-compose-generator/docker-fragments/bitcoin-eclair.yml index ec02317..ada8d0c 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-eclair.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-eclair.yml @@ -9,7 +9,7 @@ services: container_name: btcpayserver_eclair_bitcoin restart: unless-stopped stop_signal: SIGINT - image: acinq/eclair:release-0.6.1 + image: acinq/eclair:release-0.7.0 environment: PUBLIC_HOST: ${BTCPAY_HOST} JAVA_OPTS: |