AaronFiore/btcpayserver-docker
1
0
Fork 0
Code Activity

Merge pull request #694 from dennisreimann/cleanups

Browse Source
This commit is contained in:
Andrew Camilleri
2022-08-21 07:16:09 +02:00
committed by GitHub
parent 82a2b8f219 4d2d811a9c
commit 8e464848e4
3 changed files with 6 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -360,7 +360,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H
| btcpayserver/joinmarket | 0.9.5 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.5/JoinMarket/0.9.5/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.5/JoinMarket/0.9.5/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.5/JoinMarket/0.9.5/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) |
| btcpayserver/tor | 0.4.7.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.7.8/Tor/0.4.7.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.7.8/Tor/0.4.7.8/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.7.8/Tor/0.4.7.8/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/tor) |
| btcpayserver/postgres | 13.7 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.7/Postgres/13.7/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.7/Postgres/13.7/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.7/Postgres/13.7/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) |

200
contrib/build-all-images.sh
View File

@@ -153,22 +153,6 @@ docker build -f "$DOCKERFILE" -t "acinq/eclair:release-0.7.0" .
cd - && cd ..
# Build rtl
# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.3/dockerfiles/Dockerfile
DOCKERFILE="dockerfiles/Dockerfile"
# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.3/dockerfiles/Dockerfile.arm32v7
[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="dockerfiles/Dockerfile.arm32v7"
# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.3/dockerfiles/Dockerfile.arm64v8
[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="dockerfiles/Dockerfile.arm64v8"
echo "Building shahanafarooqui/rtl:0.12.3"
git clone https://github.com/Ride-The-Lightning/RTL rtl
cd rtl
git checkout v0.12.3
cd "$(dirname $DOCKERFILE)"
docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.12.3" .
cd - && cd ..
# Build lnd
# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.15.0-beta/linuxamd64.Dockerfile
DOCKERFILE="linuxamd64.Dockerfile"
@@ -185,22 +169,6 @@ docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:v0.15.0-beta" .
cd - && cd ..
# Build rtl
# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.3/dockerfiles/Dockerfile
DOCKERFILE="dockerfiles/Dockerfile"
# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.3/dockerfiles/Dockerfile.arm32v7
[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="dockerfiles/Dockerfile.arm32v7"
# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.3/dockerfiles/Dockerfile.arm64v8
[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="dockerfiles/Dockerfile.arm64v8"
echo "Building shahanafarooqui/rtl:0.12.3"
git clone https://github.com/Ride-The-Lightning/RTL rtl
cd rtl
git checkout v0.12.3
cd "$(dirname $DOCKERFILE)"
docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.12.3" .
cd - && cd ..
# Build bitcoin
# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0-1/Bitcoin/22.0/linuxamd64.Dockerfile
DOCKERFILE="Bitcoin/22.0/linuxamd64.Dockerfile"
@@ -297,7 +265,7 @@ docker build -f "$DOCKERFILE" -t "chekaz/docker-feathercoin:0.16.3" .
cd - && cd ..
# Build lightning
# Build groestlcoin-lightning
# https://raw.githubusercontent.com/Groestlcoin/lightning/v0.10.0/Dockerfile
DOCKERFILE="Dockerfile"
echo "Building groestlcoin/lightning:v0.10.0"
@@ -333,7 +301,7 @@ docker build -f "$DOCKERFILE" -t "groestlcoin/groestlcoin-spark:version-0.2.16"
cd - && cd ..
# Build eclair
# Build groestlcoin-eclair
# https://raw.githubusercontent.com/Groestlcoin/eclair/v0.6.0/Dockerfile
DOCKERFILE="Dockerfile"
echo "Building groestlcoin/eclair:v0.6.0"
@@ -345,7 +313,7 @@ docker build -f "$DOCKERFILE" -t "groestlcoin/eclair:v0.6.0" .
cd - && cd ..
# Build lnd
# Build groestlcoin-lnd
# https://raw.githubusercontent.com/Groestlcoin/lnd/v0.10.0-grs/Dockerfile
DOCKERFILE="Dockerfile"
echo "Building groestlcoin/lnd:v0.10.0-grs"
@@ -389,38 +357,6 @@ docker build -f "$DOCKERFILE" -t "btcpayserver/elements:0.21.0.2-1" .
cd - && cd ..
# Build lightning
# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.9.0-1/Dockerfile
DOCKERFILE="Dockerfile"
# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.9.0-1/contrib/linuxarm32v7.Dockerfile
[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="contrib/linuxarm32v7.Dockerfile"
# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.9.0-1/contrib/linuxarm64v8.Dockerfile
[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="contrib/linuxarm64v8.Dockerfile"
echo "Building btcpayserver/lightning:v0.9.0-1"
git clone https://github.com/btcpayserver/lightning lightning
cd lightning
git checkout basedon-v0.9.0-1
cd "$(dirname $DOCKERFILE)"
docker build -f "$DOCKERFILE" -t "btcpayserver/lightning:v0.9.0-1" .
cd - && cd ..
# Build lnd
# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.11.0-beta/linuxamd64.Dockerfile
DOCKERFILE="linuxamd64.Dockerfile"
# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.11.0-beta/linuxarm32v7.Dockerfile
[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile"
# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.11.0-beta/linuxarm64v8.Dockerfile
[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="linuxarm64v8.Dockerfile"
echo "Building btcpayserver/lnd:v0.11.0-beta"
git clone https://github.com/btcpayserver/lnd lnd
cd lnd
git checkout basedon-v0.11.0-beta
cd "$(dirname $DOCKERFILE)"
docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:v0.11.0-beta" .
cd - && cd ..
# Build litecoin
# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.21.2.1/Litecoin/0.21.2.1/linuxamd64.Dockerfile
DOCKERFILE="Litecoin/0.21.2.1/linuxamd64.Dockerfile"
@@ -577,18 +513,6 @@ docker build -f "$DOCKERFILE" -t "jvandrew/btcqbo:0.3.36" .
cd - && cd ..
# Build redis
# https://raw.githubusercontent.com/docker-library/redis/f1a8498333ae3ab340b5b39fbac1d7e1dc0d628c/5.0/Dockerfile
DOCKERFILE="5.0/Dockerfile"
echo "Building redis:5.0.2-alpine"
git clone https://github.com/docker-library/redis redis
cd redis
git checkout f1a8498333ae3ab340b5b39fbac1d7e1dc0d628c
cd "$(dirname $DOCKERFILE)"
docker build -f "$DOCKERFILE" -t "redis:5.0.2-alpine" .
cd - && cd ..
# Build btctransmuter
# https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.59/Dockerfiles/amd64.Dockerfile
DOCKERFILE="Dockerfiles/amd64.Dockerfile"
@@ -637,34 +561,6 @@ docker build -f "$DOCKERFILE" -t "chatwoot/chatwoot:v1.7.0" .
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
git checkout v1.7.0
cd "$(dirname $DOCKERFILE)"
docker build -f "$DOCKERFILE" -t "chatwoot/chatwoot:v1.7.0" .
cd - && cd ..
# Build redis
# https://raw.githubusercontent.com/docker-library/redis/f1a8498333ae3ab340b5b39fbac1d7e1dc0d628c/5.0/Dockerfile
DOCKERFILE="5.0/Dockerfile"
echo "Building redis:5.0.2-alpine"
git clone https://github.com/docker-library/redis redis
cd redis
git checkout f1a8498333ae3ab340b5b39fbac1d7e1dc0d628c
cd "$(dirname $DOCKERFILE)"
docker build -f "$DOCKERFILE" -t "redis:5.0.2-alpine" .
cd - && cd ..
# Build cloudflared
# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Cloudflared/2022.6.3/Cloudflared/2022.6.3/linuxamd64.Dockerfile
DOCKERFILE="Cloudflared/2022.6.3/linuxamd64.Dockerfile"
@@ -725,7 +621,7 @@ docker build -f "$DOCKERFILE" -t "lukechilds/electrumx:latest" .
cd - && cd ..
# Build core
# Build fireflyiii-core
# 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
DOCKERFILE="Dockerfile"
# 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
@@ -939,22 +835,6 @@ docker build -f "$DOCKERFILE" -t "btcpayserver/docker-gen:0.7.8" .
cd - && cd ..
# Build tor
# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.5.9/Tor/0.4.5.9/linuxamd64.Dockerfile
DOCKERFILE="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
[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="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
[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Tor/0.4.5.9/linuxarm64v8.Dockerfile"
echo "Building btcpayserver/tor:0.4.5.9"
git clone https://github.com/btcpayserver/dockerfile-deps tor
cd tor
git checkout Tor/0.4.5.9
cd "$(dirname $DOCKERFILE)"
docker build -f "$DOCKERFILE" -t "btcpayserver/tor:0.4.5.9" .
cd - && cd ..
# Build tor
# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.7.8/Tor/0.4.7.8/linuxamd64.Dockerfile
DOCKERFILE="Tor/0.4.7.8/linuxamd64.Dockerfile"
@@ -1023,30 +903,6 @@ docker build -f "$DOCKERFILE" -t "zammad/zammad-docker-compose:zammad-postgresql
cd - && cd ..
# Build zammad-docker-compose
# https://raw.githubusercontent.com/zammad/zammad-docker-compose/master/containers/zammad-elasticsearch/Dockerfile
DOCKERFILE="containers/zammad-elasticsearch/Dockerfile"
echo "Building zammad/zammad-docker-compose:zammad-elasticsearch-3.4.0-4"
git clone https://github.com/zammad/zammad-docker-compose zammad-docker-compose
cd zammad-docker-compose
git checkout master
cd "$(dirname $DOCKERFILE)"
docker build -f "$DOCKERFILE" -t "zammad/zammad-docker-compose:zammad-elasticsearch-3.4.0-4" .
cd - && cd ..
# Build zammad-docker-compose
# https://raw.githubusercontent.com/zammad/zammad-docker-compose/master/containers/zammad/Dockerfile
DOCKERFILE="containers/zammad/Dockerfile"
echo "Building zammad/zammad-docker-compose:zammad-3.4.0-4"
git clone https://github.com/zammad/zammad-docker-compose zammad-docker-compose
cd zammad-docker-compose
git checkout master
cd "$(dirname $DOCKERFILE)"
docker build -f "$DOCKERFILE" -t "zammad/zammad-docker-compose:zammad-3.4.0-4" .
cd - && cd ..
# Build memcached
# https://raw.githubusercontent.com/docker-library/memcached/master/alpine/Dockerfile
DOCKERFILE="alpine/Dockerfile"
@@ -1059,54 +915,6 @@ docker build -f "$DOCKERFILE" -t "memcached:1.5.22-alpine" .
cd - && cd ..
# Build zammad-docker-compose
# https://raw.githubusercontent.com/zammad/zammad-docker-compose/master/containers/zammad/Dockerfile
DOCKERFILE="containers/zammad/Dockerfile"
echo "Building zammad/zammad-docker-compose:zammad-3.4.0-4"
git clone https://github.com/zammad/zammad-docker-compose zammad-docker-compose
cd zammad-docker-compose
git checkout master
cd "$(dirname $DOCKERFILE)"
docker build -f "$DOCKERFILE" -t "zammad/zammad-docker-compose:zammad-3.4.0-4" .
cd - && cd ..
# Build zammad-docker-compose
# https://raw.githubusercontent.com/zammad/zammad-docker-compose/master/containers/zammad/Dockerfile
DOCKERFILE="containers/zammad/Dockerfile"
echo "Building zammad/zammad-docker-compose:zammad-3.4.0-4"
git clone https://github.com/zammad/zammad-docker-compose zammad-docker-compose
cd zammad-docker-compose
git checkout master
cd "$(dirname $DOCKERFILE)"
docker build -f "$DOCKERFILE" -t "zammad/zammad-docker-compose:zammad-3.4.0-4" .
cd - && cd ..
# Build zammad-docker-compose
# https://raw.githubusercontent.com/zammad/zammad-docker-compose/master/containers/zammad/Dockerfile
DOCKERFILE="containers/zammad/Dockerfile"
echo "Building zammad/zammad-docker-compose:zammad-3.4.0-4"
git clone https://github.com/zammad/zammad-docker-compose zammad-docker-compose
cd zammad-docker-compose
git checkout master
cd "$(dirname $DOCKERFILE)"
docker build -f "$DOCKERFILE" -t "zammad/zammad-docker-compose:zammad-3.4.0-4" .
cd - && cd ..
# Build zammad-docker-compose
# https://raw.githubusercontent.com/zammad/zammad-docker-compose/master/containers/zammad/Dockerfile
DOCKERFILE="containers/zammad/Dockerfile"
echo "Building zammad/zammad-docker-compose:zammad-3.4.0-4"
git clone https://github.com/zammad/zammad-docker-compose zammad-docker-compose
cd zammad-docker-compose
git checkout master
cd "$(dirname $DOCKERFILE)"
docker build -f "$DOCKERFILE" -t "zammad/zammad-docker-compose:zammad-3.4.0-4" .
cd - && cd ..
# Build postgres
# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.7/Postgres/13.7/linuxamd64.Dockerfile
DOCKERFILE="Postgres/13.7/linuxamd64.Dockerfile"

2
docker-compose-generator/docker-fragments/opt-add-tor-relay.yml
View File

@@ -17,7 +17,7 @@ services:
tor-relay:
restart: unless-stopped
image: btcpayserver/tor:0.4.5.9
image: btcpayserver/tor:0.4.7.8
container_name: tor-relay
environment:
TOR_PASSWORD: btcpayserver