AaronFiore/btcpayserver-docker
1
0
Fork 0
Code Activity

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

Browse Source
This commit is contained in:
Andrew Camilleri
2018-12-07 09:49:16 +01:00
parent c84cf72ada 2fb50a68c4
commit 095eff7be9
5 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
btcpay-setup.sh
View File

@@ -295,6 +295,15 @@ ExecReload=/bin/bash -c '. /etc/profile.d/btcpay-env.sh && cd \"\$(dirname \$BTC
[Install] [Install]
WantedBy=multi-user.target" > /etc/systemd/system/btcpayserver.service WantedBy=multi-user.target" > /etc/systemd/system/btcpayserver.service
if ! [ -f "/etc/docker/daemon.json" ]; then
echo "{
\"log-driver\": \"json-file\",
\"log-opts\": {\"max-size\": \"5m\", \"max-file\": \"3\"}
}" > /etc/docker/daemon.json
echo "Setting limited log files in /etc/docker/daemon.json"
systemctl restart docker
fi
echo -e "BTCPay Server systemd configured in /etc/systemd/system/btcpayserver.service\n" echo -e "BTCPay Server systemd configured in /etc/systemd/system/btcpayserver.service\n"
echo "BTCPay Server starting... this can take 5 to 10 minutes..." echo "BTCPay Server starting... this can take 5 to 10 minutes..."
systemctl daemon-reload systemctl daemon-reload

8
btcpay-update.sh
View File

@@ -17,6 +17,14 @@ fi
cd "$BTCPAY_BASE_DIRECTORY/btcpayserver-docker" cd "$BTCPAY_BASE_DIRECTORY/btcpayserver-docker"
git pull --force git pull --force
if ! [ -f "/etc/docker/daemon.json" ]; then
echo "{
\"log-driver\": \"json-file\",
\"log-opts\": {\"max-size\": \"5m\", \"max-file\": \"3\"}
}" > /etc/docker/daemon.json
echo "Setting limited log files in /etc/docker/daemon.json"
fi
. ./build.sh . ./build.sh
if [ "$BTCPAYGEN_OLD_PREGEN" == "true" ]; then if [ "$BTCPAYGEN_OLD_PREGEN" == "true" ]; then
cp Generated/docker-compose.generated.yml $BTCPAY_DOCKER_COMPOSE cp Generated/docker-compose.generated.yml $BTCPAY_DOCKER_COMPOSE

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

@@ -2,7 +2,7 @@ version: "3"
services: services:
lnd_bitcoin: lnd_bitcoin:
image: btcpayserver/lnd:v0.5-beta-3 image: btcpayserver/lnd:v0.5.1-beta
container_name: btcpayserver_lnd_bitcoin container_name: btcpayserver_lnd_bitcoin
restart: unless-stopped restart: unless-stopped
environment: environment:

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

@@ -2,7 +2,7 @@ version: "3"
services: services:
lnd_litecoin: lnd_litecoin:
image: btcpayserver/lnd:v0.5-beta-3 image: btcpayserver/lnd:v0.5.1-beta
container_name: btcpayserver_lnd_litecoin container_name: btcpayserver_lnd_litecoin
restart: unless-stopped restart: unless-stopped
environment: environment:

4
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.1 image: jvandrew/btcqbo:0.1.8
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.1 image: jvandrew/btcqbo:0.1.8
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: