Skip to content

Set container cursor #14516

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

Merged
AmelBawa-msft merged 3 commits into from
Mar 24, 2026
+17 −16
Merged

Set container cursor #14516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b32931
Container cursor
AmelBawa-msft Mar 24, 2026
473bb37
Update pull image callback
AmelBawa-msft Mar 24, 2026
781210b
Clang format
AmelBawa-msft Mar 24, 2026
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
22 changes: 13 additions & 9 deletions src/windows/wslc/services/ContainerService.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Module Name:
#include "ContainerService.h"
#include "ConsoleService.h"
#include "ImageService.h"
#include "PullImageCallback.h"
#include <wslutil.h>
#include <WSLAProcessLauncher.h>
#include <CommandLine.h>
Expand Down Expand Up @@ -75,8 +76,7 @@ static void SetContainerArguments(WSLAProcessOptions& options, std::vector<const
options.CommandLine = {.Values = argsStorage.data(), .Count = static_cast<ULONG>(argsStorage.size())};
}

static wsl::windows::common::RunningWSLAContainer CreateInternal(
Session& session, const std::string& image, const ContainerOptions& options, IProgressCallback* callback)
static wsl::windows::common::RunningWSLAContainer CreateInternal(Session& session, const std::string& image, const ContainerOptions& options)
{
auto processFlags = WSLAProcessFlagsNone;
WI_SetFlagIf(processFlags, WSLAProcessFlagsStdin, options.Interactive);
Expand Down Expand Up @@ -131,9 +131,13 @@ static wsl::windows::common::RunningWSLAContainer CreateInternal(
auto [result, runningContainer] = containerLauncher.CreateNoThrow(*session.Get());
if (result == WSLA_E_IMAGE_NOT_FOUND)
{
PrintMessage(L"Image '%hs' not found, pulling", stderr, image.c_str());
ImageService imageService;
imageService.Pull(session, image, callback);
{
// Attempt to pull the image if not found
PullImageCallback callback;
PrintMessage(L"Image '%hs' not found, pulling", stderr, image.c_str());
ImageService imageService;
imageService.Pull(session, image, &callback);
Comment thread
AmelBawa-msft marked this conversation as resolved.
}
return containerLauncher.Create(*session.Get());
}

Expand Down Expand Up @@ -246,10 +250,10 @@ std::wstring ContainerService::ContainerStateToString(WSLAContainerState state,
return std::format(L"{} {}", stateString, FormatRelativeTime(stateChangedAt));
}

int ContainerService::Run(Session& session, const std::string& image, ContainerOptions runOptions, IProgressCallback* callback)
int ContainerService::Run(Session& session, const std::string& image, ContainerOptions runOptions)
{
// Create the container
auto runningContainer = CreateInternal(session, image, runOptions, callback);
auto runningContainer = CreateInternal(session, image, runOptions);
runningContainer.SetDeleteOnClose(false);
auto& container = runningContainer.Get();

Expand All @@ -271,9 +275,9 @@ int ContainerService::Run(Session& session, const std::string& image, ContainerO
return 0;
}

CreateContainerResult ContainerService::Create(Session& session, const std::string& image, ContainerOptions runOptions, IProgressCallback* callback)
CreateContainerResult ContainerService::Create(Session& session, const std::string& image, ContainerOptions runOptions)
{
auto runningContainer = CreateInternal(session, image, runOptions, callback);
auto runningContainer = CreateInternal(session, image, runOptions);
runningContainer.SetDeleteOnClose(false);
auto& container = runningContainer.Get();
WSLAContainerId id{};
Expand Down
4 changes: 2 additions & 2 deletions src/windows/wslc/services/ContainerService.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ struct ContainerService
static std::wstring ContainerStateToString(WSLAContainerState state, ULONGLONG stateChangedAt = 0);
static std::wstring FormatRelativeTime(ULONGLONG timestamp);
static int Attach(models::Session& session, const std::string& id);
static int Run(models::Session& session, const std::string& image, models::ContainerOptions options, IProgressCallback* callback);
static models::CreateContainerResult Create(models::Session& session, const std::string& image, models::ContainerOptions options, IProgressCallback* callback);
static int Run(models::Session& session, const std::string& image, models::ContainerOptions options);
static models::CreateContainerResult Create(models::Session& session, const std::string& image, models::ContainerOptions options);
static void Start(models::Session& session, const std::string& id, bool attach = false);
static void Stop(models::Session& session, const std::string& id, models::StopContainerOptions options);
static void Kill(models::Session& session, const std::string& id, WSLASignal signal = WSLASignalSIGKILL);
Expand Down
7 changes: 2 additions & 5 deletions src/windows/wslc/tasks/ContainerTasks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ Module Name:
#include "ContainerModel.h"
#include "ContainerService.h"
#include "ContainerTasks.h"
#include "PullImageCallback.h"
#include "SessionModel.h"
#include "SessionService.h"
#include "TablePrinter.h"
Expand All @@ -43,9 +42,8 @@ void CreateContainer(CLIExecutionContext& context)
WI_ASSERT(context.Data.Contains(Data::Session));
WI_ASSERT(context.Args.Contains(ArgType::ImageId));
WI_ASSERT(context.Data.Contains(Data::ContainerOptions));
PullImageCallback callback;
auto result = ContainerService::Create(
context.Data.Get<Data::Session>(), WideToMultiByte(context.Args.Get<ArgType::ImageId>()), context.Data.Get<Data::ContainerOptions>(), &callback);
context.Data.Get<Data::Session>(), WideToMultiByte(context.Args.Get<ArgType::ImageId>()), context.Data.Get<Data::ContainerOptions>());
PrintMessage(MultiByteToWide(result.Id));
}

Expand Down Expand Up @@ -176,9 +174,8 @@ void RunContainer(CLIExecutionContext& context)
WI_ASSERT(context.Data.Contains(Data::Session));
WI_ASSERT(context.Args.Contains(ArgType::ImageId));
WI_ASSERT(context.Data.Contains(Data::ContainerOptions));
PullImageCallback callback;
context.ExitCode = ContainerService::Run(
context.Data.Get<Data::Session>(), WideToMultiByte(context.Args.Get<ArgType::ImageId>()), context.Data.Get<Data::ContainerOptions>(), &callback);
context.Data.Get<Data::Session>(), WideToMultiByte(context.Args.Get<ArgType::ImageId>()), context.Data.Get<Data::ContainerOptions>());
}

void SetContainerOptionsFromArgs(CLIExecutionContext& context)
Expand Down
Loading