From 5972bd00601dae39e1931742bd717014c217fa0b Mon Sep 17 00:00:00 2001 From: Joel Dickson Date: Fri, 22 Jan 2021 10:35:57 +0700 Subject: [PATCH] Enable tty output from Docker Actions (#916) * Update DockerCommandManager.cs * Update StepHost.cs Co-authored-by: Tingluo Huang --- src/Runner.Worker/Container/DockerCommandManager.cs | 3 ++- src/Runner.Worker/Handlers/StepHost.cs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Runner.Worker/Container/DockerCommandManager.cs b/src/Runner.Worker/Container/DockerCommandManager.cs index 8663e9340..4ac0e96b6 100644 --- a/src/Runner.Worker/Container/DockerCommandManager.cs +++ b/src/Runner.Worker/Container/DockerCommandManager.cs @@ -197,7 +197,8 @@ namespace GitHub.Runner.Worker.Container dockerOptions.Add($"--workdir {container.ContainerWorkDirectory}"); dockerOptions.Add($"--rm"); - + dockerOptions.Add($"-t"); + foreach (var env in container.ContainerEnvironmentVariables) { // e.g. -e MY_SECRET maps the value into the exec'ed process without exposing diff --git a/src/Runner.Worker/Handlers/StepHost.cs b/src/Runner.Worker/Handlers/StepHost.cs index 0907eaed2..83c70b8e4 100644 --- a/src/Runner.Worker/Handlers/StepHost.cs +++ b/src/Runner.Worker/Handlers/StepHost.cs @@ -182,7 +182,7 @@ namespace GitHub.Runner.Worker.Handlers dockerCommandArgs.Add($"exec"); // [OPTIONS] - dockerCommandArgs.Add($"-i"); + dockerCommandArgs.Add($"-it"); dockerCommandArgs.Add($"--workdir {workingDirectory}"); foreach (var env in environment) {