mirror of
https://github.com/weaveworks/scope.git
synced 2026-05-06 01:08:03 +00:00
Minimal fix to make scope start with Docker for Mac again.
@dglaubman found that recent versions of Docker for Mac (Docker version
18.03.0-ce, build 0520e24) don't write out
${HOME}/Library/Containers/com.docker.docker/Data/database any more.
@foot confirmed this. A fresh installation of Docker for Mac (Version
18.03.0-ce-mac60 (23751), Channel: stable) did not create the file.
The result was that installations which had this leftover file could start
scope, whereas newer couldn't. The fix simply changes this check to a path
which actually exists.
Thanks @dglaubman and @foot for the analysis and confirmation.
Fixes #3064
This commit is contained in:
2
scope
2
scope
@@ -124,7 +124,7 @@ check_docker_for_mac() {
|
||||
&& [ -S /var/run/docker.sock ] \
|
||||
&& [ ! "${DOCKER_HOST+x}" = x ] \
|
||||
&& [ "${HOME+x}" = x ] \
|
||||
&& [ -d "${HOME}/Library/Containers/com.docker.docker/Data/database" ]
|
||||
&& [ -d "${HOME}/Library/Containers/com.docker.docker/Data" ]
|
||||
}
|
||||
|
||||
# Check that a container named $1 with image $2 is not running
|
||||
|
||||
Reference in New Issue
Block a user