Skip to content

[release/13.1] Fix: Execute container runtime health check on single-image builds #13579

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
joperezr merged 7 commits into from
Dec 16, 2025
Merged

[release/13.1] Fix: Execute container runtime health check on single-image builds #13579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
497bbf6
Initial plan
Copilot Dec 15, 2025
7ad13d4
Implement fix for container runtime check with Archive destinations
Copilot Dec 15, 2025
b1e3fb3
Fix ResourcesRequireContainerRuntimeAsync to maintain backward compat…
Copilot Dec 15, 2025
4ab05a6
Address PR feedback: optimize runtime checks and move to BuildImageAsync
Copilot Dec 15, 2025
3442dec
Add Destination to ResolvedContainerBuildOptions to avoid recomputing
Copilot Dec 15, 2025
f6d99b9
Include container runtime name in error messages
Copilot Dec 16, 2025
bfed158
[release/13.1] Fix: Skip container runtime check for Archive destinat…
Copilot Dec 16, 2025
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
20 changes: 18 additions & 2 deletions src/Aspire.Hosting/Publishing/ResourceContainerImageManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,8 @@ public async Task BuildImagesAsync(IEnumerable<IResource> resources, Cancellatio

if (!containerRuntimeHealthy)
{
logger.LogError("Container runtime is not running or is unhealthy. Cannot build container images.");
throw new InvalidOperationException("Container runtime is not running or is unhealthy.");
logger.LogError("Container runtime '{ContainerRuntimeName}' is not running or is unhealthy. Cannot build container images.", ContainerRuntime.Name);
throw new InvalidOperationException($"Container runtime '{ContainerRuntime.Name}' is not running or is unhealthy.");
}

logger.LogDebug("{ContainerRuntimeName} is healthy", ContainerRuntime.Name);
Expand All @@ -214,6 +214,22 @@ public async Task BuildImageAsync(IResource resource, CancellationToken cancella

var options = await ResolveContainerBuildOptionsAsync(resource, cancellationToken).ConfigureAwait(false);

// Check if this resource needs a container runtime
if (await ResourcesRequireContainerRuntimeAsync([resource], cancellationToken).ConfigureAwait(false))
{
logger.LogDebug("Checking {ContainerRuntimeName} health", ContainerRuntime.Name);

var containerRuntimeHealthy = await ContainerRuntime.CheckIfRunningAsync(cancellationToken).ConfigureAwait(false);

if (!containerRuntimeHealthy)
{
logger.LogError("Container runtime '{ContainerRuntimeName}' is not running or is unhealthy. Cannot build container image.", ContainerRuntime.Name);
throw new InvalidOperationException($"Container runtime '{ContainerRuntime.Name}' is not running or is unhealthy.");
}

logger.LogDebug("{ContainerRuntimeName} is healthy", ContainerRuntime.Name);
}

if (resource is ProjectResource)
{
// If it is a project resource we need to build the container image
Expand Down
5 changes: 3 additions & 2 deletions tests/Aspire.Hosting.Tests/Publishing/ResourceContainerImageManagerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,12 +616,13 @@ public async Task BuildImageAsync_ThrowsInvalidOperationException_WhenDockerRunt
var exception = await Assert.ThrowsAsync<InvalidOperationException>(() =>
imageBuilder.BuildImagesAsync([container.Resource], cts.Token));

Assert.Equal("Container runtime is not running or is unhealthy.", exception.Message);
Assert.Contains("Container runtime", exception.Message);
Assert.Contains("is not running or is unhealthy", exception.Message);

var collector = app.Services.GetFakeLogCollector();
var logs = collector.GetSnapshot();

Assert.Contains(logs, log => log.Message.Contains("Container runtime is not running or is unhealthy. Cannot build container images."));
Assert.Contains(logs, log => log.Message.Contains("is not running or is unhealthy. Cannot build container images."));
}

[Fact]
Expand Down