[release/13.1] Fix: Execute container runtime health check on single-image builds #13579
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Updated ResourcesRequireContainerRuntimeAsync to skip runtime check for resources with Archive destination - Added runtime check to BuildImageAsync for Dockerfile resources - Updated FakeContainerRuntime test helper to support isRunning parameter - Added tests to verify the behavior (3 of 4 passing, 1 test needs refinement) Co-authored-by: captainsafia <[email protected]>
…ibility Reordered logic to check Dockerfile resources first, then Archive destination, preserving the original behavior for OCI + OutputPath combinations. Co-authored-by: captainsafia <[email protected]>
- Move container runtime check to beginning of BuildImageAsync for all resource types - Optimize ResourcesRequireContainerRuntimeAsync to call ResolveContainerBuildOptionsAsync once - Only check Destination when OutputPath is present to avoid unnecessary callback Co-authored-by: captainsafia <[email protected]>
- Added Destination property to ResolvedContainerBuildOptions class - Set Destination in ResolveContainerBuildOptionsAsync from context - Use Destination directly in ResourcesRequireContainerRuntimeAsync instead of calling ProcessContainerBuildOptionsCallbackAsync again - Simplifies logic and avoids redundant callback invocations Co-authored-by: captainsafia <[email protected]>
- Updated error log and exception messages to include container runtime name
- Changed from "Container runtime is not running" to "Container runtime '{name}' is not running"
- Updated test assertions to match new error message format
- Improves error diagnostics by showing which runtime (docker/podman) is being checked
Co-authored-by: captainsafia <[email protected]>
dotnet-policy-service
bot
added
Re-opened Github-Action PR
and removed
Closed Github-Action PR
labels
Contributor
Author
|
🚀 Dogfood this PR with:
curl -fsSL https://raw.githubusercontent.com/dotnet/aspire/main/eng/scripts/get-aspire-cli-pr.sh | bash -s -- 13579Or
iex "& { $(irm https://raw.githubusercontent.com/dotnet/aspire/main/eng/scripts/get-aspire-cli-pr.ps1) } 13579" |
Member
|
@copilot Remove the |
Contributor
|
@captainsafia I've opened a new pull request, #13580, to work on those changes. Once the pull request is ready, I'll request review from you. |
10 tasks
…ions and improve error messages (#13580) * Initial plan * Remove ContainerImageDestination related parts as requested - Removed Destination property from ResolvedContainerBuildOptions - Reverted ResourcesRequireContainerRuntimeAsync to original logic - Removed 5 tests that used ContainerImageDestination enum - Reverted FakeContainerRuntime test helper changes - Kept error message improvements with container runtime name Co-authored-by: captainsafia <[email protected]> --------- Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: captainsafia <[email protected]>
captainsafia
changed the title
captainsafia
approved these changes
Dec 16, 2025
joperezr
approved these changes
Dec 16, 2025
Member
joperezr
left a comment
joperezr
left a comment
There was a problem hiding this comment.
Might be good later to think about how to best de-duplicate the code.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport of #13576 to release/13.1
/cc @captainsafia @copilot
Customer Impact
Makes sure the the container runtime check is in place when doing single-image builds so that users get clearer errors when their deployments will fail because Docker/Podman is not running.
Testing
Automated and manual.
Risk
Low.
Regression?
No.