aljaz/btcpayserver-docker
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver-docker.git synced 2025-12-19 05:14:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into grs-clightning

Browse Source
This commit is contained in:
Kukks
2018-12-10 09:24:57 +01:00
parent 594597c580 f120a968b1
commit baafb7c5c4
5 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,16 +71,16 @@ cd - && cd ..
# Build lnd # Build lnd
# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.5-beta-3/linuxamd64.Dockerfile # https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.5.1-beta/linuxamd64.Dockerfile
DOCKERFILE="linuxamd64.Dockerfile" DOCKERFILE="linuxamd64.Dockerfile"
# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.5-beta-3/linuxarm32v7.Dockerfile # https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.5.1-beta/linuxarm32v7.Dockerfile
[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile" [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile"
echo "Building btcpayserver/lnd:v0.5-beta-3" echo "Building btcpayserver/lnd:v0.5.1-beta"
git clone https://github.com/btcpayserver/lnd lnd git clone https://github.com/btcpayserver/lnd lnd
cd lnd cd lnd
git checkout basedon-v0.5-beta-3 git checkout basedon-v0.5.1-beta
cd "$(dirname $DOCKERFILE)" cd "$(dirname $DOCKERFILE)"
docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:v0.5-beta-3" . docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:v0.5.1-beta" .
cd - && cd .. cd - && cd ..
@@ -113,16 +113,16 @@ cd - && cd ..
# Build btcpayserver # Build btcpayserver
# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.24/Dockerfile.linuxamd64 # https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.26/Dockerfile.linuxamd64
DOCKERFILE="Dockerfile.linuxamd64" DOCKERFILE="Dockerfile.linuxamd64"
# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.24/Dockerfile.linuxarm32v7 # https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.26/Dockerfile.linuxarm32v7
[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.linuxarm32v7" [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.linuxarm32v7"
echo "Building btcpayserver/btcpayserver:1.0.3.24" echo "Building btcpayserver/btcpayserver:1.0.3.26"
git clone https://github.com/btcpayserver/btcpayserver btcpayserver git clone https://github.com/btcpayserver/btcpayserver btcpayserver
cd btcpayserver cd btcpayserver
git checkout v1.0.3.24 git checkout v1.0.3.26
cd "$(dirname $DOCKERFILE)" cd "$(dirname $DOCKERFILE)"
docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.0.3.24" . docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.0.3.26" .
cd - && cd .. cd - && cd ..
@@ -191,16 +191,16 @@ cd - && cd ..
# Build lnd # Build lnd
# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.5-beta-3/linuxamd64.Dockerfile # https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.5.1-beta/linuxamd64.Dockerfile
DOCKERFILE="linuxamd64.Dockerfile" DOCKERFILE="linuxamd64.Dockerfile"
# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.5-beta-3/linuxarm32v7.Dockerfile # https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.5.1-beta/linuxarm32v7.Dockerfile
[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile" [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile"
echo "Building btcpayserver/lnd:v0.5-beta-3" echo "Building btcpayserver/lnd:v0.5.1-beta"
git clone https://github.com/btcpayserver/lnd lnd git clone https://github.com/btcpayserver/lnd lnd
cd lnd cd lnd
git checkout basedon-v0.5-beta-3 git checkout basedon-v0.5.1-beta
cd "$(dirname $DOCKERFILE)" cd "$(dirname $DOCKERFILE)"
docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:v0.5-beta-3" . docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:v0.5.1-beta" .
cd - && cd .. cd - && cd ..
@@ -283,26 +283,26 @@ cd - && cd ..
# Build btcqbo # Build btcqbo
# https://raw.githubusercontent.com/JeffVandrewJr/btcqbo/v0.1.1/Dockerfile # https://raw.githubusercontent.com/JeffVandrewJr/btcqbo/v0.1.8/Dockerfile
DOCKERFILE="Dockerfile" DOCKERFILE="Dockerfile"
echo "Building jvandrew/btcqbo:0.1.1" echo "Building jvandrew/btcqbo:0.1.8"
git clone https://github.com/JeffVandrewJr/btcqbo btcqbo git clone https://github.com/JeffVandrewJr/btcqbo btcqbo
cd btcqbo cd btcqbo
git checkout v0.1.1 git checkout v0.1.8
cd "$(dirname $DOCKERFILE)" cd "$(dirname $DOCKERFILE)"
docker build -f "$DOCKERFILE" -t "jvandrew/btcqbo:0.1.1" . docker build -f "$DOCKERFILE" -t "jvandrew/btcqbo:0.1.8" .
cd - && cd .. cd - && cd ..
# Build btcqbo # Build btcqbo
# https://raw.githubusercontent.com/JeffVandrewJr/btcqbo/v0.1.1/Dockerfile # https://raw.githubusercontent.com/JeffVandrewJr/btcqbo/v0.1.8/Dockerfile
DOCKERFILE="Dockerfile" DOCKERFILE="Dockerfile"
echo "Building jvandrew/btcqbo:0.1.1" echo "Building jvandrew/btcqbo:0.1.8"
git clone https://github.com/JeffVandrewJr/btcqbo btcqbo git clone https://github.com/JeffVandrewJr/btcqbo btcqbo
cd btcqbo cd btcqbo
git checkout v0.1.1 git checkout v0.1.8
cd "$(dirname $DOCKERFILE)" cd "$(dirname $DOCKERFILE)"
docker build -f "$DOCKERFILE" -t "jvandrew/btcqbo:0.1.1" . docker build -f "$DOCKERFILE" -t "jvandrew/btcqbo:0.1.8" .
cd - && cd .. cd - && cd ..

1
docker-compose-generator/docker-fragments/bitcoin-lnd.yml
View File

@@ -20,6 +20,7 @@ services:
externalip=${BTCPAY_HOST}:9735 externalip=${BTCPAY_HOST}:9735
alias=${LIGHTNING_ALIAS} alias=${LIGHTNING_ALIAS}
adminmacaroonpath=/data/admin.macaroon adminmacaroonpath=/data/admin.macaroon
invoicemacaroonpath=/data/invoice.macaroon
noseedbackup=1 noseedbackup=1
notls=1 notls=1
ports: ports:

2
docker-compose-generator/docker-fragments/btcpayserver.yml
View File

@@ -4,7 +4,7 @@ services:
btcpayserver: btcpayserver:
restart: unless-stopped restart: unless-stopped
image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.0.3.25} image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.0.3.26}
expose: expose:
- "49392" - "49392"
environment: environment:

1
docker-compose-generator/docker-fragments/litecoin-lnd.yml
View File

@@ -18,6 +18,7 @@ services:
externalip=${BTCPAY_HOST}:9736 externalip=${BTCPAY_HOST}:9736
alias=${LIGHTNING_ALIAS} alias=${LIGHTNING_ALIAS}
adminmacaroonpath=/data/admin.macaroon adminmacaroonpath=/data/admin.macaroon
invoicemacaroonpath=/data/invoice.macaroon
noseedbackup=1 noseedbackup=1
notls=1 notls=1
ports: ports:

10
docker-compose-generator/docker-fragments/opt-add-btcqbo.yml
View File

@@ -2,7 +2,7 @@ version: "3"
services: services:
btcqbo: btcqbo:
image: jvandrew/btcqbo:0.1.8 image: jvandrew/btcqbo:0.1.20
environment: environment:
REDIS_URL: "redis://redis:6379/0" REDIS_URL: "redis://redis:6379/0"
BTCPAY_HOST: ${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST} BTCPAY_HOST: ${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}
@@ -12,7 +12,7 @@ services:
links: links:
- redis - redis
rq-worker: rq-worker:
image: jvandrew/btcqbo:0.1.8 image: jvandrew/btcqbo:0.1.20
entrypoint: /usr/local/bin/rq entrypoint: /usr/local/bin/rq
command: worker -u redis://redis:6379/0 btcqbo command: worker -u redis://redis:6379/0 btcqbo
environment: environment:
@@ -27,6 +27,8 @@ services:
- "6379" - "6379"
volumes: volumes:
- "redis_datadir:/data" - "redis_datadir:/data"
btcpayserver:
environment:
BTCPAY_EXTERNALSERVICES: "Quickbooks Online Connector:btcqbo;"
volumes: volumes:
redis_datadir: redis_datadir: