Browse Source
Do not run btcpay-update.sh in the test, fix install
tor-relay
nicolas.dorier
5 years ago
No known key found for this signature in database
GPG Key ID: 6618763EF09186FE
3 changed files with
5 additions and
12 deletions
-
.circleci/test-connectivity.sh
-
.circleci/test-install.sh
-
btcpay-update.sh
|
|
|
@ -1,5 +1,6 @@ |
|
|
|
#!/bin/bash |
|
|
|
|
|
|
|
echo "Trying to connect to btcpayserver..." |
|
|
|
while true; do |
|
|
|
if [ "$(curl -sL -w "%{http_code}\\n" "http://localhost/" -o /dev/null)" == "200" ]; then |
|
|
|
echo "Successfully contacted BTCPayServer" |
|
|
|
|
|
|
|
@ -17,9 +17,8 @@ export BTCPAYGEN_REVERSEPROXY="nginx" |
|
|
|
export BTCPAYGEN_LIGHTNING="clightning" |
|
|
|
source ./btcpay-setup.sh -i |
|
|
|
|
|
|
|
timeout 10m bash .circleci/test-connectivity.sh |
|
|
|
timeout 5m bash .circleci/test-connectivity.sh |
|
|
|
|
|
|
|
# Testing scripts are not crashing and installed |
|
|
|
btcpay-up.sh |
|
|
|
btcpay-update.sh |
|
|
|
btcpay-down.sh |
|
|
|
@ -31,21 +31,14 @@ if [[ "$1" != "--skip-git-pull" ]]; then |
|
|
|
return |
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
if ! [[ "$OSTYPE" == "darwin"* ]]; then |
|
|
|
# Not Mac OS |
|
|
|
# TODO Should we configure logging for Mac OS too? The file path will be different and access rights need to be considered too... |
|
|
|
|
|
|
|
if ! [ -f "/etc/docker/daemon.json" ]; then |
|
|
|
if ! [[ "$OSTYPE" == "darwin"* ]] && ! [ -f "/etc/docker/daemon.json" ] && [ -w "/etc/docker" ]; 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 |
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
. ./build.sh |
|
|
|
if [ "$BTCPAYGEN_OLD_PREGEN" == "true" ]; then |
|
|
|
cp Generated/docker-compose.generated.yml $BTCPAY_DOCKER_COMPOSE |
|
|
|
|
