diff --git a/README.md b/README.md index e42a557..d2f6805 100644 --- a/README.md +++ b/README.md @@ -347,7 +347,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | shahanafarooqui/rtl | 0.12.3 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.3/dockerfiles/Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.3/dockerfiles/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.3/dockerfiles/Dockerfile.arm64v8) | [Github](https://github.com/Ride-The-Lightning/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | | btcpayserver/lnd | v0.15.0-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.15.0-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.15.0-beta/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.15.0-beta/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcoin | 22.0-1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0-1/Bitcoin/22.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0-1/Bitcoin/22.0/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0-1/Bitcoin/22.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcoin) | -| btcpayserver/btcpayserver | 1.6.8$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.6.8/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.6.8/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.6.8/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | +| btcpayserver/btcpayserver | 1.6.10$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.6.10/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.6.10/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.6.10/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | | btcpayserver/monero | 0.18.1.0-amd64 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.1.0/Monero/0.18.1.0/linuxamd64.Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/monero) | | nicolasdorier/nbxplorer | 2.3.33 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.33/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.33/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.33/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | 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) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 67f21bf..3855e1b 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -153,6 +153,22 @@ 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" @@ -169,6 +185,22 @@ 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" @@ -210,18 +242,18 @@ cd - && cd .. # Build btcpayserver -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.6.8/amd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.6.10/amd64.Dockerfile DOCKERFILE="amd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.6.8/arm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.6.10/arm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.6.8/arm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.6.10/arm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" -echo "Building btcpayserver/btcpayserver:1.6.8$?" +echo "Building btcpayserver/btcpayserver:1.6.10$?" git clone https://github.com/btcpayserver/btcpayserver btcpayserver cd btcpayserver -git checkout v1.6.8 +git checkout v1.6.10 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.6.8$?" . +docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.6.10$?" . cd - && cd .. @@ -265,7 +297,7 @@ docker build -f "$DOCKERFILE" -t "chekaz/docker-feathercoin:0.16.3" . cd - && cd .. -# Build groestlcoin-lightning +# Build lightning # https://raw.githubusercontent.com/Groestlcoin/lightning/v0.10.0/Dockerfile DOCKERFILE="Dockerfile" echo "Building groestlcoin/lightning:v0.10.0" @@ -301,7 +333,7 @@ docker build -f "$DOCKERFILE" -t "groestlcoin/groestlcoin-spark:version-0.2.16" cd - && cd .. -# Build groestlcoin-eclair +# Build eclair # https://raw.githubusercontent.com/Groestlcoin/eclair/v0.6.0/Dockerfile DOCKERFILE="Dockerfile" echo "Building groestlcoin/eclair:v0.6.0" @@ -313,7 +345,7 @@ docker build -f "$DOCKERFILE" -t "groestlcoin/eclair:v0.6.0" . cd - && cd .. -# Build groestlcoin-lnd +# Build lnd # https://raw.githubusercontent.com/Groestlcoin/lnd/v0.10.0-grs/Dockerfile DOCKERFILE="Dockerfile" echo "Building groestlcoin/lnd:v0.10.0-grs" @@ -357,6 +389,38 @@ 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" @@ -513,6 +577,18 @@ 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" @@ -561,6 +637,34 @@ 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" @@ -621,7 +725,7 @@ docker build -f "$DOCKERFILE" -t "lukechilds/electrumx:latest" . cd - && cd .. -# Build fireflyiii-core +# Build 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 @@ -851,6 +955,22 @@ docker build -f "$DOCKERFILE" -t "btcpayserver/tor:0.4.7.8" . 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" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.7.8/Tor/0.4.7.8/linuxarm32v7.Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="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 +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Tor/0.4.7.8/linuxarm64v8.Dockerfile" +echo "Building btcpayserver/tor:0.4.7.8" +git clone https://github.com/btcpayserver/dockerfile-deps tor +cd tor +git checkout Tor/0.4.7.8 +cd "$(dirname $DOCKERFILE)" +docker build -f "$DOCKERFILE" -t "btcpayserver/tor:0.4.7.8" . +cd - && cd .. + + # Build docker-gen # https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile DOCKERFILE="linuxamd64.Dockerfile" @@ -903,6 +1023,30 @@ 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" @@ -915,6 +1059,54 @@ 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" diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml index 91a5a43..d6f6cd1 100644 --- a/docker-compose-generator/docker-fragments/btcpayserver.yml +++ b/docker-compose-generator/docker-fragments/btcpayserver.yml @@ -3,7 +3,7 @@ version: "3" services: btcpayserver: restart: unless-stopped - image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.6.9$?} + image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.6.10$?} expose: - "49392" environment: