From c629f3b7799c846a18c8d652ae1f9699e29ded6d Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Thu, 13 Jan 2022 19:02:35 +0900 Subject: [PATCH] Remove lottrue bitcoin image --- README.md | 1 - contrib/DockerFileBuildHelper/Program.cs | 11 ----- contrib/build-all-images.sh | 16 ------- .../bitcointaprootcc-bip8-lottrue.yml | 43 ------------------- 4 files changed, 71 deletions(-) delete mode 100644 docker-compose-generator/docker-fragments/bitcointaprootcc-bip8-lottrue.yml diff --git a/README.md b/README.md index 165462a..d448dde 100644 --- a/README.md +++ b/README.md @@ -342,7 +342,6 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | saubyk/c-lightning-rest | 0.5.2 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.5.2/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.5.2/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.5.2/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.11.2 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile.arm64v8) | [Github](https://github.com/Ride-The-Lightning/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | | btcpayserver/lnd | v0.14.1-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.14.1-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.14.1-beta/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.14.1-beta/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | -| btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | | btcpayserver/btcpayserver | 1.3.7$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.7/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.7/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.7/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | | nicolasdorier/nbxplorer | 2.2.18 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.18/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.18/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.18/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index 6e04835..82c2583 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -407,17 +407,6 @@ namespace DockerFileBuildHelper dockerInfo.SupportedByUs = true; break; } - case "bitcointaprootcc/0.21.0-bip8-lottrue": - { - var tagNoRevision = image.Tag.Split('-').First(); - dockerInfo.DockerFilePath = $"bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile"; - dockerInfo.DockerFilePathARM32v7 = $"bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile"; - dockerInfo.DockerFilePathARM64v8 = $"bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile"; - dockerInfo.GitLink = "https://github.com/btcpayserver/dockerfile-deps"; - dockerInfo.GitRef = $"bitcointaprootcc/0.21.0-bip8-lottrue"; - dockerInfo.SupportedByUs = true; - break; - } case "elements": { var tagNoRevision = image.Tag.Split('-').First(); diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 63f818b..02dba75 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -229,22 +229,6 @@ docker build -f "$DOCKERFILE" -t "chekaz/docker-bitcoinplus:2.7.0" . cd - && cd .. -# Build bitcointaprootcc/0.21.0-bip8-lottrue -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile -DOCKERFILE="bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile" -echo "Building btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue:latest" -git clone https://github.com/btcpayserver/dockerfile-deps bitcointaprootcc/0.21.0-bip8-lottrue -cd bitcointaprootcc/0.21.0-bip8-lottrue -git checkout bitcointaprootcc/0.21.0-bip8-lottrue -cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue:latest" . -cd - && cd .. - - # Build docker-bitcore # https://raw.githubusercontent.com/dalijolijo/btcpayserver-docker-bitcore/master/docker-bitcored/Dockerfile DOCKERFILE="docker-bitcored/Dockerfile" diff --git a/docker-compose-generator/docker-fragments/bitcointaprootcc-bip8-lottrue.yml b/docker-compose-generator/docker-fragments/bitcointaprootcc-bip8-lottrue.yml deleted file mode 100644 index f4cc596..0000000 --- a/docker-compose-generator/docker-fragments/bitcointaprootcc-bip8-lottrue.yml +++ /dev/null @@ -1,43 +0,0 @@ -version: "3" - -services: - bitcoind: - restart: unless-stopped - container_name: btcpayserver_bitcoind - image: btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue - environment: - BITCOIN_NETWORK: ${NBITCOIN_NETWORK:-regtest} - BITCOIN_WALLETDIR: "/walletdata" - # rpcport and rpcbind seems duplicates, but they are not - # rpcport is using by some tooling to automatically get - # the rpcport from the configuration file. Do not remove! - BITCOIN_EXTRA_ARGS: | - rpcport=43782 - rpcbind=0.0.0.0:43782 - rpcallowip=0.0.0.0/0 - port=39388 - whitelist=0.0.0.0/0 - maxmempool=500 - expose: - - "43782" - - "39388" - volumes: - - "bitcoin_datadir:/data" - - "bitcoin_wallet_datadir:/walletdata" - nbxplorer: - environment: - NBXPLORER_CHAINS: "btc" - NBXPLORER_BTCRPCURL: http://bitcoind:43782/ - NBXPLORER_BTCNODEENDPOINT: bitcoind:39388 - volumes: - - "bitcoin_datadir:/root/.bitcoin" - btcpayserver: - environment: - BTCPAY_CHAINS: "btc" - BTCPAY_BTCEXPLORERURL: http://nbxplorer:32838/ -volumes: - bitcoin_datadir: - bitcoin_wallet_datadir: - -exclusive: - - bitcoin-node \ No newline at end of file