Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions src/Runner.Common/HostContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,14 @@ public async Task Delay(TimeSpan delay, CancellationToken cancellationToken)
await Task.Delay(delay, cancellationToken);
}

/// <summary>
/// Register a default dynamic service.
/// </summary>
public void RegisterService(Type type, Type target)
{
_serviceTypes.TryAdd(type, target);
}

/// <summary>
/// Creates a new instance of T.
/// </summary>
Expand Down
9 changes: 8 additions & 1 deletion src/Runner.Worker/ActionManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,14 @@ public sealed class ActionManager : RunnerService, IActionManager
// We are running at the start of a job
if (rootStepId == default(Guid))
{
IOUtil.DeleteDirectory(HostContext.GetDirectory(WellKnownDirectory.Actions), executionContext.CancellationToken);
try
{
IOUtil.DeleteDirectory(HostContext.GetDirectory(WellKnownDirectory.Actions), executionContext.CancellationToken);
}
catch
{
executionContext.Debug($"Unable to delete {HostContext.GetDirectory(WellKnownDirectory.Actions)}.");
}
}
// We are running mid job due to a local composite action
else
Expand Down
4 changes: 2 additions & 2 deletions src/Runner.Worker/Container/ContainerInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ public ContainerInfo(IHostContext hostContext)
UpdateWebProxyEnv(hostContext.WebProxy);
}

public ContainerInfo(IHostContext hostContext, Pipelines.JobContainer container, bool isJobContainer = true, string networkAlias = null)
public ContainerInfo(IHostContext hostContext, Pipelines.JobContainer container, bool isJobContainer = true, string networkAlias = null, string displayName = null)
{
this.ContainerName = container.Alias;

string containerImage = container.Image;
ArgUtil.NotNullOrEmpty(containerImage, nameof(containerImage));

this.ContainerImage = containerImage;
this.ContainerDisplayName = $"{container.Alias}_{Pipelines.Validation.NameValidation.Sanitize(containerImage)}_{Guid.NewGuid().ToString("N").Substring(0, 6)}";
this.ContainerDisplayName = displayName == null ? $"{container.Alias}_{Pipelines.Validation.NameValidation.Sanitize(containerImage)}_{Guid.NewGuid().ToString("N").Substring(0, 6)}" : displayName;
this.ContainerCreateOptions = container.Options;
_environmentVariables = container.Environment;
this.IsJobContainer = isJobContainer;
Expand Down
36 changes: 34 additions & 2 deletions src/Runner.Worker/Container/DockerCommandManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ namespace GitHub.Runner.Worker.Container
[ServiceLocator(Default = typeof(DockerCommandManager))]
public interface IDockerCommandManager : IRunnerService
{
string Type { get; }
string DockerPath { get; }
string DockerInstanceLabel { get; }
Task<DockerVersion> DockerVersion(IExecutionContext context);
Expand All @@ -24,14 +25,16 @@ public interface IDockerCommandManager : IRunnerService
Task<int> DockerRun(IExecutionContext context, ContainerInfo container, EventHandler<ProcessDataReceivedEventArgs> stdoutDataReceived, EventHandler<ProcessDataReceivedEventArgs> stderrDataReceived);
Task<int> DockerStart(IExecutionContext context, string containerId);
Task<int> DockerLogs(IExecutionContext context, string containerId);
Task<List<string>> DockerPS(IExecutionContext context, string options);
Task<List<string>> DockerListByLabel(IExecutionContext context);
Task<List<string>> DockerListByContainerId(IExecutionContext context, string containerId, string status = null);
Task<List<string>> DockerGetEnv(IExecutionContext context, string dockerObject);
Task<int> DockerRemove(IExecutionContext context, string containerId);
Task<int> DockerNetworkCreate(IExecutionContext context, string network);
Task<int> DockerNetworkRemove(IExecutionContext context, string network);
Task<int> DockerNetworkPrune(IExecutionContext context);
Task<int> DockerExec(IExecutionContext context, string containerId, string options, string command);
Task<int> DockerExec(IExecutionContext context, string containerId, string options, string command, List<string> outputs);
Task<List<string>> DockerInspect(IExecutionContext context, string dockerObject, string options);
Task<string> DockerReadyStatus(IExecutionContext context, string dockerObject);
Task<List<PortMapping>> DockerPort(IExecutionContext context, string containerId);
Task<int> DockerLogin(IExecutionContext context, string configFileDirectory, string registry, string username, string password);
}
Expand All @@ -42,9 +45,12 @@ public class DockerCommandManager : RunnerService, IDockerCommandManager

public string DockerInstanceLabel { get; private set; }

public string Type { get; private set; }

public override void Initialize(IHostContext hostContext)
{
base.Initialize(hostContext);
Type = "docker";
DockerPath = WhichUtil.Which("docker", true, Trace);
DockerInstanceLabel = IOUtil.GetSha256Hash(hostContext.GetDirectory(WellKnownDirectory.Root)).Substring(0, 6);
}
Expand Down Expand Up @@ -273,6 +279,26 @@ public async Task<int> DockerLogs(IExecutionContext context, string containerId)
return await ExecuteDockerCommandAsync(context, "logs", $"--details {containerId}", context.CancellationToken);
}

public async Task<List<string>> DockerListByLabel(IExecutionContext context)
{
return await DockerPS(context, $"--all --quiet --no-trunc --filter \"label={DockerInstanceLabel}\"");
}

public async Task<List<string>> DockerGetEnv(IExecutionContext context, string containerID)
{
var options = "--format \"{{range .Config.Env}}{{println .}}{{end}}\"";
return await ExecuteDockerCommandAsync(context, "inspect", $"{options} {containerID}");
}

public async Task<List<string>> DockerListByContainerId(IExecutionContext context, string containerId, string status = null)
{
string filter = "";
if (status != "") {
filter = $" --filter status={status.ToLower()}";
}
return await DockerPS(context, $"--all --filter id={containerId}${filter} --no-trunc --format \"{{{{.ID}}}} {{{{.Status}}}}\"");
}

public async Task<List<string>> DockerPS(IExecutionContext context, string options)
{
return await ExecuteDockerCommandAsync(context, "ps", options);
Expand Down Expand Up @@ -352,6 +378,12 @@ public async Task<List<string>> DockerInspect(IExecutionContext context, string
return await ExecuteDockerCommandAsync(context, "inspect", $"{options} {dockerObject}");
}

public async Task<string> DockerReadyStatus(IExecutionContext context, string dockerObject)
{
string healthCheck = "--format=\"{{if .Config.Healthcheck}}{{print .State.Health.Status}}{{end}}\"";
return (await DockerInspect(context: context, dockerObject: dockerObject, options: healthCheck)).FirstOrDefault();
}

public async Task<List<PortMapping>> DockerPort(IExecutionContext context, string containerId)
{
List<string> portMappingLines = await ExecuteDockerCommandAsync(context, "port", containerId);
Expand Down
Loading