mirror of
https://github.com/Retropex/btcpayserver-docker.git
synced 2025-05-13 05:20:40 +02:00
Make sure /etc/docker is writable before creating daemon.json
This commit is contained in:
parent
60bd11f833
commit
2c26a90304
@ -17,7 +17,7 @@ export BTCPAYGEN_REVERSEPROXY="nginx"
|
|||||||
export BTCPAYGEN_LIGHTNING="clightning"
|
export BTCPAYGEN_LIGHTNING="clightning"
|
||||||
source ./btcpay-setup.sh -i
|
source ./btcpay-setup.sh -i
|
||||||
|
|
||||||
timeout 5m bash .circleci/test-connectivity.sh
|
timeout 1m 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
|
||||||
|
@ -456,7 +456,7 @@ ExecReload=/bin/bash -c '. \"$BASH_PROFILE_SCRIPT\" && cd \"\$BTCPAY_BASE_DIRECT
|
|||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target" > /etc/systemd/system/btcpayserver.service
|
WantedBy=multi-user.target" > /etc/systemd/system/btcpayserver.service
|
||||||
|
|
||||||
if ! [[ -f "/etc/docker/daemon.json" ]]; then
|
if ! [[ -f "/etc/docker/daemon.json" ]] && [ -w "/etc/docker" ]; 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\"}
|
||||||
|
@ -31,7 +31,7 @@ if [[ "$1" != "--skip-git-pull" ]]; then
|
|||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! [[ "$OSTYPE" == "darwin"* ]] && ! [ -f "/etc/docker/daemon.json" ] && [ -w "/etc/docker" ]; then
|
if ! [ -f "/etc/docker/daemon.json" ] && [ -w "/etc/docker" ]; 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\"}
|
||||||
|
Loading…
Reference in New Issue
Block a user