From ae16958fd8395be79d471d693aac0ab6083c1851 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 16 Jul 2021 08:09:28 +0200 Subject: [PATCH] Docker: Improve marking daemon problems Small positive exit codes can result for different reasons. Real docker issues result in small negative exit codes. Change-Id: Ibd800b7806f3014ffccd39638c06b2dd93e8a5a1 Reviewed-by: hjk --- src/plugins/docker/dockerdevice.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp index b355eb5d9b3..037d0c901c8 100644 --- a/src/plugins/docker/dockerdevice.cpp +++ b/src/plugins/docker/dockerdevice.cpp @@ -734,7 +734,9 @@ void DockerDevicePrivate::tryCreateLocalFileAccess() LOG("RES: " << m_shell->result() << " STDOUT: " << m_shell->readAllStandardOutput() << " STDERR: " << m_shell->readAllStandardError()); - if (m_shell->exitCode() != 0) { + // negative exit codes indicate problems like no docker daemon, missing permissions, + // no shell and seem to result in exit codes 125+ + if (m_shell->exitCode() > 120) { m_accessible = NoDaemon; LOG("DOCKER DAEMON NOT RUNNING?"); MessageManager::writeFlashing(tr("Docker Daemon appears to be not running. "