feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Docker: Add default search path for docker binary

Browse Source 
Change-Id: I86e02f726e9dac7302c3435f53fdb47c70fffafd
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Marcus Tillmanns
2022-11-17 07:16:39 +01:00
parent 1ecde217a0
commit 74d915d6aa
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/docker/dockersettings.cpp
View File

@@ -5,6 +5,7 @@
#include "dockerconstants.h"
#include "dockertr.h"
#include "utils/hostosinfo.h"
#include <coreplugin/icore.h>
@@ -22,10 +23,17 @@ DockerSettings::DockerSettings()
setSettingsGroup(Constants::DOCKER);
setAutoApply(false);
FilePaths additionalPaths;
if (HostOsInfo::isWindowsHost())
additionalPaths.append("C:/Program Files/Docker/Docker/resources/bin");
else
additionalPaths.append("/usr/local/bin");
registerAspect(&dockerBinaryPath);
dockerBinaryPath.setDisplayStyle(StringAspect::PathChooserDisplay);
dockerBinaryPath.setExpectedKind(PathChooser::ExistingCommand);
dockerBinaryPath.setDefaultFilePath(FilePath::fromString("docker").searchInPath({"/usr/local/bin"}));
dockerBinaryPath.setDefaultFilePath(
FilePath::fromString("docker").searchInPath(additionalPaths));
dockerBinaryPath.setDisplayName(Tr::tr("Docker CLI"));
dockerBinaryPath.setHistoryCompleter("Docker.Command.History");
dockerBinaryPath.setLabelText(Tr::tr("Command:"));