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

Do not run btcpay-update.sh in the test, fix install

Browse Source
This commit is contained in:
nicolas.dorier 2019-09-04 17:03:52 +09:00
parent a9ff6f0e11
commit 60bd11f833
No known key found for this signature in database
GPG Key ID: 6618763EF09186FE
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.circleci/test-connectivity.sh
View File

@ -1,5 +1,6 @@
#!/bin/bash #!/bin/bash
echo "Trying to connect to btcpayserver..."
while true; do while true; do
if [ "$(curl -sL -w "%{http_code}\\n" "http://localhost/" -o /dev/null)" == "200" ]; then if [ "$(curl -sL -w "%{http_code}\\n" "http://localhost/" -o /dev/null)" == "200" ]; then
echo "Successfully contacted BTCPayServer" echo "Successfully contacted BTCPayServer"

3
.circleci/test-install.sh
View File

@ -17,9 +17,8 @@ export BTCPAYGEN_REVERSEPROXY="nginx"
export BTCPAYGEN_LIGHTNING="clightning" export BTCPAYGEN_LIGHTNING="clightning"
source ./btcpay-setup.sh -i 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 # Testing scripts are not crashing and installed
btcpay-up.sh btcpay-up.sh
btcpay-update.sh
btcpay-down.sh btcpay-down.sh

9
btcpay-update.sh
View File

@ -31,21 +31,14 @@ if [[ "$1" != "--skip-git-pull" ]]; then
return return
fi fi
if ! [[ "$OSTYPE" == "darwin"* ]] && ! [ -f "/etc/docker/daemon.json" ] && [ -w "/etc/docker" ]; then
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 "{ echo "{
\"log-driver\": \"json-file\", \"log-driver\": \"json-file\",
\"log-opts\": {\"max-size\": \"5m\", \"max-file\": \"3\"} \"log-opts\": {\"max-size\": \"5m\", \"max-file\": \"3\"}
}" > /etc/docker/daemon.json }" > /etc/docker/daemon.json
echo "Setting limited log files in /etc/docker/daemon.json" echo "Setting limited log files in /etc/docker/daemon.json"
fi
fi 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