Skip to content

Commit

Permalink
Do not run btcpay-update.sh in the test, fix install
Browse files Browse the repository at this point in the history
  • Loading branch information
NicolasDorier committed Sep 4, 2019
1 parent a9ff6f0 commit 60bd11f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 12 deletions.
1 change: 1 addition & 0 deletions .circleci/test-connectivity.sh
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
3 changes: 1 addition & 2 deletions .circleci/test-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
13 changes: 3 additions & 10 deletions btcpay-update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
echo "{
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
echo "Setting limited log files in /etc/docker/daemon.json"
fi


. ./build.sh
if [ "$BTCPAYGEN_OLD_PREGEN" == "true" ]; then
cp Generated/docker-compose.generated.yml $BTCPAY_DOCKER_COMPOSE
Expand Down

0 comments on commit 60bd11f

Please sign in to comment.