Retropex/btcpayserver-docker
1
0
Fork 0
mirror of https://github.com/Retropex/btcpayserver-docker.git synced 2025-05-13 05:20:40 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Give timeout to stop docker-compose, SIGKILL clightning"

Browse Source 
This reverts commit 487565658a.
This commit is contained in:
nicolas.dorier 2018-11-05 18:28:01 +09:00
parent 487565658a
commit ac4263d71a
8 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
btcpay-down.sh
View File

@ -3,4 +3,4 @@
. /etc/profile.d/btcpay-env.sh . /etc/profile.d/btcpay-env.sh
cd "`dirname $BTCPAY_ENV_FILE`" cd "`dirname $BTCPAY_ENV_FILE`"
docker-compose -f $BTCPAY_DOCKER_COMPOSE down -t 180 docker-compose -f $BTCPAY_DOCKER_COMPOSE down

4
btcpay-restart.sh
View File

@ -3,5 +3,5 @@
. /etc/profile.d/btcpay-env.sh . /etc/profile.d/btcpay-env.sh
cd "`dirname $BTCPAY_ENV_FILE`" cd "`dirname $BTCPAY_ENV_FILE`"
docker-compose -f $BTCPAY_DOCKER_COMPOSE down -t 180 docker-compose -f $BTCPAY_DOCKER_COMPOSE down
docker-compose -f $BTCPAY_DOCKER_COMPOSE up -d -t 180 docker-compose -f $BTCPAY_DOCKER_COMPOSE up -d

8
btcpay-setup.sh
View File

@ -270,9 +270,9 @@ Requires=docker.service network-online.target
Type=oneshot Type=oneshot
RemainAfterExit=yes RemainAfterExit=yes
ExecStart=/bin/bash -c '. /etc/profile.d/btcpay-env.sh && cd \"\$(dirname \$BTCPAY_ENV_FILE)\" && docker-compose -f \"\$BTCPAY_DOCKER_COMPOSE\" up -d -t 180' ExecStart=/bin/bash -c '. /etc/profile.d/btcpay-env.sh && cd \"\$(dirname \$BTCPAY_ENV_FILE)\" && docker-compose -f \"\$BTCPAY_DOCKER_COMPOSE\" up -d'
ExecStop=/bin/bash -c '. /etc/profile.d/btcpay-env.sh && cd \"\$(dirname \$BTCPAY_ENV_FILE)\" && docker-compose -f \"\$BTCPAY_DOCKER_COMPOSE\" stop' ExecStop=/bin/bash -c '. /etc/profile.d/btcpay-env.sh && cd \"\$(dirname \$BTCPAY_ENV_FILE)\" && docker-compose -f \"\$BTCPAY_DOCKER_COMPOSE\" stop'
ExecReload=/bin/bash -c '. /etc/profile.d/btcpay-env.sh && cd \"\$(dirname \$BTCPAY_ENV_FILE)\" && docker-compose -f \"\$BTCPAY_DOCKER_COMPOSE\" restart -t 180' ExecReload=/bin/bash -c '. /etc/profile.d/btcpay-env.sh && cd \"\$(dirname \$BTCPAY_ENV_FILE)\" && docker-compose -f \"\$BTCPAY_DOCKER_COMPOSE\" restart'
[Install] [Install]
WantedBy=multi-user.target" > /etc/systemd/system/btcpayserver.service WantedBy=multi-user.target" > /etc/systemd/system/btcpayserver.service
@ -299,7 +299,7 @@ stop on runlevel [!2345]
script script
. /etc/profile.d/btcpay-env.sh . /etc/profile.d/btcpay-env.sh
cd \"\$(dirname \$BTCPAY_ENV_FILE)\" cd \"\$(dirname \$BTCPAY_ENV_FILE)\"
docker-compose -f \"\$BTCPAY_DOCKER_COMPOSE\" up -d -t 180 docker-compose -f \"\$BTCPAY_DOCKER_COMPOSE\" up -d
end script" > /etc/init/start_containers.conf end script" > /etc/init/start_containers.conf
echo -e "BTCPay Server upstart configured in /etc/init/start_containers.conf\n" echo -e "BTCPay Server upstart configured in /etc/init/start_containers.conf\n"
initctl reload-configuration initctl reload-configuration
@ -313,7 +313,7 @@ if [ ! -z "$OLD_BTCPAY_DOCKER_COMPOSE" ] && [ "$OLD_BTCPAY_DOCKER_COMPOSE" != "$
docker-compose -f "$OLD_BTCPAY_DOCKER_COMPOSE" down docker-compose -f "$OLD_BTCPAY_DOCKER_COMPOSE" down
fi fi
docker-compose -f "$BTCPAY_DOCKER_COMPOSE" up -d --remove-orphans -t 180 docker-compose -f "$BTCPAY_DOCKER_COMPOSE" up -d --remove-orphans
# Give SSH key to BTCPay # Give SSH key to BTCPay
if [[ -f "$BTCPAY_HOST_SSHKEYFILE" ]]; then if [[ -f "$BTCPAY_HOST_SSHKEYFILE" ]]; then

2
btcpay-up.sh
View File

@ -3,4 +3,4 @@
. /etc/profile.d/btcpay-env.sh . /etc/profile.d/btcpay-env.sh
cd "`dirname $BTCPAY_ENV_FILE`" cd "`dirname $BTCPAY_ENV_FILE`"
docker-compose -f $BTCPAY_DOCKER_COMPOSE up --remove-orphans -d -t 180 docker-compose -f $BTCPAY_DOCKER_COMPOSE up --remove-orphans -d

2
btcpay-update.sh
View File

@ -36,4 +36,4 @@ for scriptname in *.sh; do
done done
cd "`dirname $BTCPAY_ENV_FILE`" cd "`dirname $BTCPAY_ENV_FILE`"
docker-compose -f $BTCPAY_DOCKER_COMPOSE up -d --remove-orphans -t 180 docker-compose -f $BTCPAY_DOCKER_COMPOSE up -d --remove-orphans

2
changedomain.sh
View File

@ -20,5 +20,5 @@ echo "BTCPAY_HOST=$BTCPAY_HOST" >> "$BTCPAY_ENV_FILE"
echo "ACME_CA_URI=$ACME_CA_URI" >> "$BTCPAY_ENV_FILE" echo "ACME_CA_URI=$ACME_CA_URI" >> "$BTCPAY_ENV_FILE"
cd "`dirname $BTCPAY_ENV_FILE`" cd "`dirname $BTCPAY_ENV_FILE`"
docker-compose -f "$BTCPAY_DOCKER_COMPOSE" up -d -t 180 docker-compose -f "$BTCPAY_DOCKER_COMPOSE" up -d
fi fi

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

@ -3,7 +3,6 @@ version: "3"
services: services:
clightning_bitcoin: clightning_bitcoin:
image: nicolasdorier/clightning:v0.6.2-3 image: nicolasdorier/clightning:v0.6.2-3
stop_signal: SIGKILL
container_name: btcpayserver_clightning_bitcoin container_name: btcpayserver_clightning_bitcoin
restart: unless-stopped restart: unless-stopped
environment: environment:

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

@ -3,7 +3,6 @@ version: "3"
services: services:
clightning_litecoin: clightning_litecoin:
image: nicolasdorier/clightning:v0.6.2-3 image: nicolasdorier/clightning:v0.6.2-3
stop_signal: SIGKILL
container_name: btcpayserver_clightning_litecoin container_name: btcpayserver_clightning_litecoin
restart: unless-stopped restart: unless-stopped
environment: environment: