Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't generate WSL distributions for docker-desktop* #4156

Merged
2 commits merged into from
Jan 9, 2020
Merged

Don't generate WSL distributions for docker-desktop* #4156

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0e6209
Don't generate WSL distributions for docker-desktop*
DHowett Jan 9, 2020
dec03cb
Update src/cascadia/TerminalApp/WslDistroGenerator.cpp
DHowett Jan 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/cascadia/TerminalApp/WslDistroGenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
#include <fcntl.h>
#include "DefaultProfileUtils.h"

static constexpr std::wstring_view DockerDistributionPrefix{ L"docker-desktop" };
miniksa marked this conversation as resolved.
Show resolved Hide resolved

using namespace ::TerminalApp;

// Legacy GUIDs:
Expand Down Expand Up @@ -97,6 +99,14 @@ std::vector<TerminalApp::Profile> WslDistroGenerator::GenerateProfiles()
{
std::wstring distName;
std::getline(wlinestream, distName, L'\r');

if (distName.substr(0, std::min(distName.size(), DockerDistributionPrefix.size())) == DockerDistributionPrefix)
{
// Docker for Windows creates some utility distributions to handle Docker commands.
// Pursuant to GH#3556, because they are _not_ user-facing we want to hide them.
continue;
}

size_t firstChar = distName.find_first_of(L"( ");
// Some localizations don't have a space between the name and "(Default)"
// https://github.com/microsoft/terminal/issues/1168#issuecomment-500187109
Expand Down