Skip to content

Bug/compose timeout #953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
theLockesmith wants to merge 7 commits into
base: 2.0
Choose a base branch
from
Open

Bug/compose timeout #953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8ca3ac0
allow COMPOSE_HTTP_TIMEOUT variable to be set
Nov 9, 2024
f1b3181
allow COMPOSE_HTTP_TIMEOUT variable to be set
Nov 9, 2024
48f27e6
removed quotes from arithmetic expression as it breaks in zsh. New me…
Nov 9, 2024
fe41833
removed quotes from variable
Nov 9, 2024
f1fb74c
allow COMPOSE_HTTP_TIMEOUT variable to be set
Nov 9, 2024
cc52fe0
put quotes back on variable
Nov 9, 2024
d58d3a0
changed 'helpers.sh' to relative path './helpers.sh' to work in zsh
Nov 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ Check out this video if you're interested in learning more about setting up [BTC
* `BTCPAYGEN_EXCLUDE_FRAGMENTS`: Semicolon-separated list of fragments you want to forcefully exclude (eg. `litecoin-clightning`)
* `TOR_RELAY_NICKNAME`: If tor relay is activated with opt-add-tor-relay, the relay nickname
* `TOR_RELAY_EMAIL`: If tor relay is activated with opt-add-tor-relay, the email for Tor to contact you regarding your relay
* `COMPOSE_HTTP_TIMEOUT`: Timeout (in seconds) for `docker compose` command. Defaults to 180 seconds.

Additionally, there are specific environment variables for some addons:

Expand Down
7 changes: 4 additions & 3 deletions btcpay-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ START=""
HAS_DOCKER=true
STARTUP_REGISTER=true
SYSTEMD_RELOAD=true
while (( "$#" )); do
while (( $# )); do
case "$1" in
-i)
START=true
Expand Down Expand Up @@ -206,6 +206,7 @@ fi
: "${BTCPAY_ENABLE_SSH:=false}"
: "${PIHOLE_SERVERIP:=}"
: "${CLOUDFLARE_TUNNEL_TOKEN:=}"
: "${COMPOSE_HTTP_TIMEOUT:=180}"

OLD_BTCPAY_DOCKER_COMPOSE="$BTCPAY_DOCKER_COMPOSE"
ORIGINAL_DIRECTORY="$(pwd)"
Expand Down Expand Up @@ -272,7 +273,7 @@ if [[ "${BTCPAYGEN_ADDITIONAL_FRAGMENTS}" == *opt-txindex* ]] && \
fi

cd "$BTCPAY_BASE_DIRECTORY/btcpayserver-docker"
. helpers.sh
. ./helpers.sh
btcpay_expand_variables

cd "$ORIGINAL_DIRECTORY"
Expand Down Expand Up @@ -346,7 +347,7 @@ fi
touch "$BASH_PROFILE_SCRIPT"
echo "
#!/bin/bash
export COMPOSE_HTTP_TIMEOUT=\"180\"
export COMPOSE_HTTP_TIMEOUT=\"$COMPOSE_HTTP_TIMEOUT\"
export BTCPAYGEN_OLD_PREGEN=\"$BTCPAYGEN_OLD_PREGEN\"
export BTCPAYGEN_CRYPTO1=\"$BTCPAYGEN_CRYPTO1\"
export BTCPAYGEN_CRYPTO2=\"$BTCPAYGEN_CRYPTO2\"
Expand Down
3 changes: 2 additions & 1 deletion helpers.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,8 @@ LIT_PASSWD=$LIT_PASSWD
TALLYCOIN_APIKEY=$TALLYCOIN_APIKEY
TALLYCOIN_PASSWD=$TALLYCOIN_PASSWD
TALLYCOIN_PASSWD_CLEARTEXT=$TALLYCOIN_PASSWD_CLEARTEXT
CLOUDFLARE_TUNNEL_TOKEN=$CLOUDFLARE_TUNNEL_TOKEN" > $BTCPAY_ENV_FILE
CLOUDFLARE_TUNNEL_TOKEN=$CLOUDFLARE_TUNNEL_TOKEN
COMPOSE_HTTP_TIMEOUT=$COMPOSE_HTTP_TIMEOUT" > $BTCPAY_ENV_FILE

env | grep ^BWT_ >> $BTCPAY_ENV_FILE || true
}
Expand Down