Make sure /etc/docker is writable before creating daemon.json

This commit is contained in:
nicolas.dorier 2019-09-04 17:07:02 +09:00
parent 60bd11f833
commit 2c26a90304
No known key found for this signature in database
GPG Key ID: 6618763EF09186FE
3 changed files with 3 additions and 3 deletions

View File

@ -17,7 +17,7 @@ export BTCPAYGEN_REVERSEPROXY="nginx"
export BTCPAYGEN_LIGHTNING="clightning"
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
btcpay-up.sh

View File

@ -456,7 +456,7 @@ ExecReload=/bin/bash -c '. \"$BASH_PROFILE_SCRIPT\" && cd \"\$BTCPAY_BASE_DIRECT
[Install]
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 "{
\"log-driver\": \"json-file\",
\"log-opts\": {\"max-size\": \"5m\", \"max-file\": \"3\"}

View File

@ -31,7 +31,7 @@ if [[ "$1" != "--skip-git-pull" ]]; then
return
fi
if ! [[ "$OSTYPE" == "darwin"* ]] && ! [ -f "/etc/docker/daemon.json" ] && [ -w "/etc/docker" ]; then
if ! [ -f "/etc/docker/daemon.json" ] && [ -w "/etc/docker" ]; then
echo "{
\"log-driver\": \"json-file\",
\"log-opts\": {\"max-size\": \"5m\", \"max-file\": \"3\"}