From 420b5bf541bdeb0169c680f0b8008bf45dc54c16 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 9 Dec 2021 10:17:34 +0100 Subject: [PATCH] Docker: Start making it work on macOS Change-Id: I450c7b19de1694da456e16e95b698c1476623a97 Reviewed-by: hjk --- src/plugins/docker/dockerdevice.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp index 5377a037f7e..3734c51eb32 100644 --- a/src/plugins/docker/dockerdevice.cpp +++ b/src/plugins/docker/dockerdevice.cpp @@ -933,13 +933,13 @@ void DockerDevicePrivate::tryCreateLocalFileAccess() .arg(m_container, m_mergedDir) + '\n' + tr("Output: \"%1\"").arg(out) + '\n' + tr("Error: \"%1\"").arg(proc.stdErr())); - if (HostOsInfo::isWindowsHost()) { + if (!HostOsInfo::isLinuxHost()) { // Disabling merged layer access. This is not supported and anything - // related to accessing merged layers on Windows fails due to the need - // of using wsl or a named pipe. + // related to accessing merged layers on Windows or macOS fails due + // to the need of using wsl or a named pipe. // TODO investigate how to make it possible nevertheless. m_mergedDir.clear(); - MessageManager::writeSilently(tr("This is expected on Windows.")); + MessageManager::writeSilently(tr("This is expected on Windows and macOS.")); return; } }